From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on sa.int.altlinux.org X-Spam-Level: X-Spam-Status: No, score=-1.4 required=5.0 tests=AWL,BAYES_00 autolearn=ham version=3.2.5 Sender: =?UTF-8?B?0JTQtdC90LjRgSDQodC80LjRgNC90L7Qsg==?= Date: Sat, 19 Sep 2009 01:40:42 +0400 From: =?koi8-r?B?5MXOydMg883J0s7P1w==?= To: shigorin@gmail.com, ALT Linux Sisyphus discussions Message-ID: <20090918214042.GB32524@mw.office.seiros.ru> References: <20090912174000.GL31778@osdn.org.ua> <4AADD824.3090300@mmedia2.kemsu.ru> <4AAE8BC8.7000406@gmail.com> <200909142307.10304.ledest@gmail.com> <4AAEA9FD.7000501@gmail.com> <20090914230006.GA22580@mw.office.seiros.ru> <4AAF56E4.5010802@iop.kiev.ua> <20090916000125.GA17760@mw.office.seiros.ru> <20090918190900.GK28241@osdn.org.ua> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="8GpibOaaTibBMecb" Content-Disposition: inline In-Reply-To: <20090918190900.GK28241@osdn.org.ua> Subject: Re: [sisyphus] git/gear scheme intro docs (was: mentoring mentors) X-BeenThere: sisyphus@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: ALT Linux Sisyphus discussions List-Id: ALT Linux Sisyphus discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Sep 2009 21:40:51 -0000 Archived-At: List-Archive: List-Post: --8GpibOaaTibBMecb Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Sep 18, 2009 at 10:09:00PM +0300, Michael Shigorin wrote: MS> =EB=D4=CF =C2=D9 =C5=DD=A3 =CE=C1 =D7=C9=CB=C9 =C5=C7=CF =C4=CC=D1 =CE= =CF=D7=C9=DE=CB=CF=D7 =DA=C1=C4=CF=CB=D5=CD=C5=CE=D4=C9=D2=CF=D7=C1=CC... MS> =D1 =D7=CF=D4 =C4=CF =D3=C9=C8 =D0=CF=D2 =D4=CF=CC=D8=CB=CF rpmcs =D5= =D7=C5=D2=C5=CE=CE=CF =CF=D3=C9=CC=C9=CC. =F0=CF=D3=CC=C5 =D4=CF=C7=CF =CB=C1=CB =F7=C9=D4=C1=CC=C9=CA =D0=D2=C9=CE= =D1=CC =CD=CF=CA =D0=C1=D4=DE =CB rpmbb =C4=CC=D1 =D3=C2=CF=D2=CB=C9 =C9=DA= git -- =D1 =D5=D6=C5 =DA=C1=C2=D9=CC =CB=CF=CD=C1=CE=C4=D5 rpmbuild :) rpmbb , =C9 =D3=D2=C1=DA=D5 =CE=C1=D3=D4=D5=D0=C1=C5=D4 =D3=DE=C1= =D3=D4=D8=C5 :) MS> =F4=D5=D4 =C5=D3=D4=D8 =C5=DD=A3 =CF=C4=C9=CE =CD=CF=CD=C5=CE=D4 -- =CD= =CF=D6=CE=CF =D0=CF=CE=C1=CC=C5=D0=C9=D4=D8 =D7=D2=C5=CD=C5=CE=CE=D9=C8 =CB= =CF=CD=CD=C9=D4=CF=D7, MS> =C1 =D0=CF=D4=CF=CD =C1=CB=CB=D5=D2=C1=D4=CE=CF =C9=C8 =D0=C5=D2=C5=C2= =D2=C1=D4=D8 (e.g. git reset --soft =CE=C1_=CE=D5=D6=CE=D9=CA MS> =C9 git add --patch =D3 git commit). =F1 =D0=D2=C9 =D2=C1=C2=CF=D4=C5 =D3 mkimage-profiles-desktop =C9=D3=D0=CF= =CC=D8=DA=D5=C0 =D7=CF=CF=C2=DD=C5 =C8=C9=D4=D2=D9=CA =D0=CF=C4=C8=CF=C4 -- =D5 =CD=C5=CE=D1 =C4=D7=C1 =C2=D2=C1=DE=CE=C1, 'master' =C9 'internal'. =F7= =CF =D7=D4=CF=D2=CF=CD =CE=C1=C8=CF=C4=C9=D4=D3=D1 =CB=C1=CB =D4=CF, =DE=D4= =CF =CE=C5 =D0=D2=C5=C4=CE=C1=DA=CE=C1=DE=C5=CE=CF =C4=CC=D1 =D0=D5=C2=CC=C9=CB= =C1=C3=C9=C9 (=D3=C2=CF=D2=CB=C9 =D0=CF=C4 =CB=CF=CE=CB=D2=C5=D4=CE=CF=C7= =CF =CB=CC=C9=C5=CE=D4=C1), =D4=C1=CB =C9 =D4=C5=CB=D5=DD=C1=D1 =D2=C1=C2=CF=D4=C1 =D0=D2=C5=C4=CE=C1=DA=CE=C1=DE=C5= =CE=C1=D1 =C4=CC=D1 =D0=D5=C2=CC=C9=CB=C1=C3=C9=C9. =F7=D2=C5=CD=D1 =CF=D4 =D7=D2=C5=CD=C5=CE=C9 =D1 =D0=C5=D2=C5=CB=CC=C0=DE= =C1=C0=D3=D8 =D7 master =C9 =D3 =D0=CF=CD=CF=DD=D8=C0 cherry-pick =D0=C5=D2=C5=D4=C1=D3=CB=C9=D7=C1=C0 =D4=D5=C4=C1 =CB=CF=CD=CD=C9=D4=D9 =C4= =CC=D1 =D0=D5=C2=CC=C9=CB=C1=C3=C9=C9. =F0=CF=D4=CF=CD =D7=CF=DA=D7=D2=C1= =DD=C1=C0=D3=D8 =D7 internal =C9 =C4=C5=CC=C1=C0 rebase. =F0=D2=C9 =DC=D4=CF=CD cherry-pick =D1 =DE=C1=D3=D4=CF =C9=D3=D0=CF=CC=D8= =DA=D5=C0 =D3 -n, =DE=D4=CF=C2=D9 =CF=C2=DF=C5=C4=C9=CE=D1=D4=D8 =CE=C5=D3= =CB=CF=CC=D8=CB=CF =CB=CF=CD=CD=C9=D4=CF=D7 =D7 =CF=C4=C9=CE =C4=CC=D1 =CB=D2=C1=D3=CF=D4=D9, = =C1 =D4=C1=CB=D6=C5 =C1=CB=D4=C9=D7=CE=CF =D0=CF=CC=D8=DA=D5=C0=D3=D8 git c= ommit --amend =C4=CF =D3=CF=C2=D3=D4=D7=C5=CE=CE=CF =D7=D9=D0=CF=CC=CE=C5=CE=C9=D1 git pu= sh. =F0=CF=D3=CC=C5 =CF=CB=CF=CE=DE=C1=CE=C9=D1 =DC=D4=CF=CA =D2=C1=C2=CF=D4=D9= =D1 =C4=C5=CC=C1=C0: git fetch boyarsh git checkout master git rebase boyarsh git checkout internal git rebase master =F7 =D2=C5=DA=D5=CC=D8=D4=C1=D4=C5 =C9=CD=C5=C0 =C2=CF=CC=C5=C5-=CD=C5=CE= =C5=C5 =CB=D2=C1=D3=C9=D7=D5=C0 =C9=D3=D4=CF=D2=C9=C0, =C9 =D7=CF=DA=CD=CF= =D6=CE=CF=D3=D4=D8 =D4=D7=CF=D2=C9=D4=D8 =CE=C5=D0=CF=D4=D2=C5=C2=D3=D4=D7=C1 =D7 =C2=D2=C1=CE=DE=C5 internal =CB=CF= =D4=CF=D2=D9=C5 =D0=CF=D4=CF=CD =CE=C5 =D7=D9=D7=C1=CC=C9=D7=C1=C0=D4=D3=D1= =CE=C1 =C7=CF=CC=CF=D7=D9 =CF=D3=D4=C1=CC=D8=CE=D9=C8 =CB=CF=CC=CC=C5=C7 :) --=20 =F3 =D5=D7=C1=D6=C5=CE=C9=C5=CD, =E4=C5=CE=C9=D3 http://freesource.info ---------------------------------------------------------------------------- --8GpibOaaTibBMecb Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iEYEARECAAYFAkqz/loACgkQPuR8c4jhFKIGZwCdFK+2KXWF1ih9ZNmQv/f0SHKc asEAnRMlT9fuyalpYqLgqtTd319VIbjU =R612 -----END PGP SIGNATURE----- --8GpibOaaTibBMecb--