From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Sat, 9 Dec 2006 07:13:40 +0300 From: Alexey Tourbin To: ALT Devel discussion list Message-ID: <20061209041340.GR7986@localhost.localdomain> Mail-Followup-To: ALT Devel discussion list References: <200612062347.19270.azol@altlinux.ru> <20061207014441.GD7986@localhost.localdomain> <20061207061835.GC11612@tacit.myxomop.com> <20061207063110.GG7986@localhost.localdomain> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="tqSMaTz1cCSspCQ4" Content-Disposition: inline In-Reply-To: <20061207063110.GG7986@localhost.localdomain> Subject: Re: [devel] git - Author X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.9rc1 Precedence: list Reply-To: ALT Devel discussion list List-Id: ALT Devel discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Dec 2006 04:14:06 -0000 Archived-At: List-Archive: List-Post: --tqSMaTz1cCSspCQ4 Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Dec 07, 2006 at 09:31:10AM +0300, Alexey Tourbin wrote: > On Thu, Dec 07, 2006 at 09:18:35AM +0300, Kirill Maslinsky wrote: > > > > =E5=D3=CC=C9 =D0=CF=CE=C1=C4=C5=CC=C1=CE=D9 git-commit c =CE=C5=D0= =D2=C1=D7=C9=CC=D8=CE=D9=CD =C1=D7=D4=CF=D2=CF=CD ( =C2=D9=CC=C9 =CE=C5=D7= =C5=D2=CE=CF =CE=C1=D3=D4=D2=CF=C5=CE=D9=20 > > > > GIT_AUTHOR_NAME =C9=D4=C4. ) =DC=D4=CF =DC=D4=CF =CB=C1=CB-=D4=CF = =CC=C5=DE=C9=D4=D3=D1? > > > > =ED=CF=D6=CE=CF =CB=C1=CB-=D4=CF =D0=CF=CD=C5=CE=D1=D4=D8 Author = =D7 =D5=D6=C5 =D3=C4=C5=CC=C1=CE=CE=D9=C8 commit ? > > >=20 > > > =EE=C5=D4. > >=20 > > =F4=CF =C5=D3=D4=D8 =C5=D3=CC=C9 =CB=CF=CD=CD=C9=D4=D9 =C5=DD=C5 =CE=C9= =C7=C4=C5 =CE=C5 =CF=D0=D5=C2=CC=C9=CB=CF=D7=C1=CE=D9 (=C5=D3=D4=D8 =D4=CF= =CC=D8=CB=CF=20 > > =D7 =CC=CF=CB=C1=CC=D8=CE=CF=CD =D2=C5=D0=CF=DA=C9=D4=CF=D2=C9=C9), =D4= =CF =C9=C8 =CD=CF=D6=CE=CF =D7=D9=C2=D2=CF=D3=C9=D4=D8 =C9 =D3=C4=C5=CC=C1= =D4=D8=20 > > =CE=CF=D7=D9=C5 =D3 =D0=D2=C1=D7=C9=CC=D8=CE=D9=CD =C1=D7=D4=CF=D2=CF= =CD. >=20 > =E5=D3=CC=C9 =C4=C1=D6=C5 =CF=D0=D5=C2=CC=C9=CB=CF=D7=C1=CE=D9, =D4=CF = =CD=CF=D6=CE=CF =D3=C4=C5=CC=C1=D4=D8 git-push --force. =EE=CF =DC=D4=CF = =D5=D6=C5 > =C2=D5=C4=D5=D4 *=C4=D2=D5=C7=C9=C5* =CB=CF=CD=CD=C9=D4=D9. git-push --f= orce =C9=CE=CF=C7=C4=C1 =D5=C4=CF=C2=CE=CF =C9=D3=D0=CF=CC=D8=DA=CF=D7=C1= =D4=D8 =C4=CC=D1 > "=D0=D2=C5=C4=D7=C1=D2=C9=D4=C5=CC=D8=CE=CF=CA =D0=D5=C2=CC=C9=CB=C1=C3= =C9=C9", =DE=D4=CF=C2=D9 =D0=D2=CF=D7=C5=D2=C9=D4=D8 =D3=CF=C2=C9=D2=C1=C5= =CD=CF=D3=D4=D8 =D0=C1=CB=C5=D4=C1 =D7 > =C4=D2=D5=C7=CF=CD =CD=C5=D3=D4=C5 =C9 =D4.=D0. =EE=CF, =C5=D3=D4=C5=D3= =D4=D7=C5=CE=CE=CF, =D0=CF=CC=D8=DA=D5=D1=D3=D8 =DC=D4=C9=CD =D5=C4=CF=C2= =D3=D4=D7=CF=CD, =CB=D2=C1=CA=CE=C5 > =CE=C5=D6=C5=CC=C1=D4=C5=CC=D8=CE=CF =DA=C1=CD=C5=CE=D1=D4=D8 =CB=CF=CD= =CD=C9=D4=D9 =C4=C1=CC=D8=DB=C5, =DE=C5=CD =D0=D2=CF=D3=D4=C1=D7=CC=C5=CE = =D0=CF=D3=CC=C5=C4=CE=C9=CA =D0=D5=C2=CC=C9=DE=CE=D9=CA > =D4=C1=C7. =E9=CE=C1=DE=C5 "=D0=CF=C5=C4=C5=D4" =CE=C5 =D4=CF=CC=D8=CB= =CF =D4=CF, =DE=D4=CF =CE=C1 =D3=C1=CD=CF=CD-=D3=C1=CD=CF=CD =D7=C5=D2=C8= =D5, =CE=CF =C9 =D7=CF=CF=C2=DD=C5 > =D7=D3=A3. =F4=CF =C5=D3=D4=D8 =D0=CF =D3=D5=D4=C9 =C9=CE=CF=C7=C4=C1 =CE=C5 =C8=CF=DE= =C5=D4=D3=D1 =C4=C5=CC=C1=D4=D8 =CE=CF=D7=D9=C5 =CB=CF=CD=CD=C9=D4=D9, =CB= =CF=D4=CF=D2=D9=C5 =D1=D7=CC=D1=C0=D4=D3=D1 =CD=C5=CC=CB=C9=CD=C9 =C9=D3=D0=D2=C1=D7=CC=C5=CE= =C9=D1=CD=C9 =CB =D0=D2=C5=C4=D9=C4=D5=DD=C9=CD =CB=CF=CD=CD=C9=D4=C1=CD. = =F0=CF=DC=D4=CF=CD=D5 =D1 =D0=D2=C5=C4=C1=CC=C1=C7=C1=C0 =D4=C1=CB=CF=C5 =D0=D2=C1=D7=C9=CC=CF =C4=CC= =D1 =C9=D3=D0=CF=CC=D8=DA=CF=D7=C1=CE=C9=D1 git-push --force: =CE=C5=CC=D8= =DA=D1 =DA=C1=CD=C5=CE=D1=D4=D8 =CB=CF=CD=CD=C9=D4=D9 =C4=C1=CC=D8=DB=C5 =D0=CF=D3= =CC=C5=C4=CE=C5=C7=CF =D0=D5=C2=CC=C9=DE=CE=CF=C7=CF =D4=C1=C7=C1, =C9=CC= =C9 =D6=C5 =C4=C1=CC=D8=DB=C5 =CB=CF=CD=CD=C9=D4=C1, =CF=D4=D0=D2=C1=D7=CC=C5=CE=CE=CF=C7=CF =CE=C1 =D3= =C2=CF=D2=CB=D5 =D7 incominger. =E4=CF=D0=D5=D3=D4=C9=CD, =DE=D4=CF =DC=D4=C9 =D5=D3=CC=CF=D7=C9=D1 =D7=D9= =D0=CF=CC=CE=C5=CE=D9, =C1 =C9=D3=D0=D2=C1=D7=CC=C5=CE=C9=D1 =CD=C5=CC=CB= =C9=C8/=C7=CC=D5=D0=D9=C8 =CF=DB=C9=C2=CF=CB =CE=C5 =C8=CF=DE=C5=D4=D3=D1 =CF=C6=CF=D2=CD=CC=D1=D4=D8 =CF=D4=C4=C5=CC=D8= =CE=CF. =E4=CC=D1 =D0=D2=C9=CD=C5=D2=C1 =CF=C2=DF=D1=D3=CE=C0, =CB=C1=CB = =D0=CF=D0=D2=C1=D7=C9=D4=D8 =D0=D2=C5=C4-=D0=D2=C5=C4=D0=CF=D3=CC=C5=C4=CE=C9=CA =CB=CF=CD=CD=C9=D4. =F3=CE=C1=DE=C1=CC=C1 =CE=D5=D6=CE=CF =D3=CF=C8=D2=C1=CE=C9=D4=D8 =D4=C5=CB= =D5=DD=D5=C0 =D2=C1=C2=CF=D4=D5 =D7=CF =D7=C5=CD=C5=CE=CE=D9=CA =C2=D2=C1= =CE=DE: $ git-branch save =F0=CF=D4=CF=CD =CE=D5=D6=CE=CF =CF=D4=CB=C1=D4=C9=D4=D8 =D2=C1=C2=CF=D4=D5= =C4=CF =D0=D2=C5=C4-=D0=D2=C5=C4=D0=CF=D3=CC=C5=C4=C5=CE=C5=C7=CF =CB=CF= =CD=CD=C9=D4=C1: $ git-reset --hard HEAD^^ =F4=C5=D0=C5=D2=D8 =CE=D5=D6=CE=CF =D0=CF=D0=D2=C1=D7=C9=D4=D8 =D0=D2=C5=C4= -=D0=D2=C5=C4=D0=CF=D3=CC=C5=C4=CE=C9=CA =CB=CF=CD=CD=C9=D4, =CB=CF=D4=CF= =D2=D9=CA =D3=D4=C1=CC =D4=C5=CB=D5=DD=C9=CD: $ vim ... $ git-commit -a --am =FA=C1=D4=C5=CD =D0=CF=D7=C5=D2=C8 =D0=D2=C5=C4-=D0=D2=C5=C4=D0=CF=D3=CC=C5= =C4=CE=C5=C7=CF =CB=CF=CD=CD=C9=D4=C1 =CE=D5=D6=CE=CF =CE=C1=CB=C1=D4=C9=D4= =D8 =D0=D2=C5=C4=D0=CF=D3=CC=C5=C4=CE=C9=CA =C9 =D0=CF=D3=CC=C5=C4=CE=C9=CA =CB=CF=CD=CD=C9=D4=D9 =C9=DA =D3=CF=C8=D2=C1=CE= =C5=CE=CE=CF=C7=CF =C2=D2=C1=CE=DE=C1: $ git-cherry-pick -r save^ $ git-cherry-pick -r save =EF=D3=D4=C1=CC=CF=D3=D8 =D4=CF=CC=D8=CB=CF =D5=C4=C1=CC=C9=D4=D8 =D7=D2=C5= =CD=C5=CE=CE=D9=CA =C2=D2=C1=CE=DE: $ git-branch -D save =F0=CF=D3=CC=C5 =DC=D4=CF=C7=CF =D5=D6=C5 =CD=CF=D6=CE=CF =D3=C4=C5=CC=C1= =D4=D8 $ git-push --force git.alt (=F0=CF=D3=CC=C5=C4=CE=C5=C5 =CF=DA=CE=C1=DE=C1=C5=D4, =DE=D4=CF =D3=CF=C4= =C5=D2=D6=C9=CD=CF=C5 .git/remotes/git.alt =CD=CF=D6=C5=D4 =D7=D9=C7=CC=D1= =C4=C5=D4=D8 =CB=C1=CB "URL: git.alt:/people/$USER/packages/%name.git".) > > =F7=C5=D3=D8=CD=C1 =D7=C1=D6=CE=C1=D1 =C9=C4=C5=D1 git =D7 =D4=CF=CD, = =DE=D4=CF =C5=C4=C9=CE=CF=D6=C4=D9 =D3=CF=DA=C4=C1=CE=CE=D9=CA =CF=C2=DF=C5= =CB=D4 > > =CE=C5=CC=D8=DA=D1 =C9=DA=CD=C5=CE=C9=D4=D8 =D0=CF=D3=D4-=C6=C1=CB=D4= =D5=CD. =E2=CC=C1=C7=CF=C4=C1=D2=D1 =DC=D4=CF=CD=D5 =CE=C5=CC=D8=DA=D1 =C6= =C1=CC=D8=D3=C9=C6=C9=C3=C9=D2=CF=D7=C1=D4=D8 > > (=D2=C1=D7=CE=CF =CB=C1=CB =C9 =C9=D3=D0=D2=C1=D7=C9=D4=D8) =C9=D3=D4= =CF=D2=C9=C0 =C9=DA=CD=C5=CE=C5=CE=C9=CA. >=20 > =EB=CF=CE=C5=DE=CE=CF. =E9=CD=D1 =C1=D7=D4=CF=D2=C1 =D7=C8=CF=C4=C9=D4 = =D7 =D4=D5 =C9=CE=C6=CF=D2=CD=C1=C3=C9=C0, =C4=CC=D1 =CB=CF=D4=CF=D2=CF=CA = =D3=CF=DA=C4=C1=C5=D4=D3=D1 > =CB=D2=C9=D0=D4=CF=D3=D4=CF=CA=CB=C9=CA =C8=C5=DB-=C9=C4=C5=CE=D4=C9=C6= =C9=CB=C1=D4=CF=D2. =F0=CF=DC=D4=CF=CD=D5 =DA=C1=CD=C5=CE=C9=D4=D8 =C5=C7= =CF, =D3=CF=C8=D2=C1=CE=C9=D7 > =C9=C4=C5=CE=D4=C9=C6=C9=CB=C1=D4=CF=D2, =D5=D6=C5 =CE=C9=CB=C1=CB =CE=C5= =CC=D8=DA=D1. --tqSMaTz1cCSspCQ4 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) iD8DBQFFejfzfBKgtDjnu0YRAnkBAKDoIx+RK1a6wTPXLGskZjFhW1XiEACfWpZC VIye5z/XiSNEKjL6xX7Fic4= =zmCU -----END PGP SIGNATURE----- --tqSMaTz1cCSspCQ4--