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=-2.6 required=5.0 tests=BAYES_00 autolearn=ham version=3.2.5 X-Virus-Scanned: amavisd-new at localhost Message-ID: <4993E94D.7070307@solin.spb.ru> Date: Thu, 12 Feb 2009 12:18:05 +0300 From: Aleksey Avdeev User-Agent: Thunderbird 2.0.0.17 (X11/20080929) MIME-Version: 1.0 To: ALT Linux Team development discussions References: <4993D6E4.9040802@solin.spb.ru> <4993D8AC.5040409@solin.spb.ru> <4993E02F.2030306@solin.spb.ru> In-Reply-To: X-Enigmail-Version: 0.95.6 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig263560BF0E143DDD0C1B255C" Subject: Re: [devel] =?koi8-r?b?Z2l0IG1lcmdlIC1zIG91cnMgzsHPws/Sz9Q=?= X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.10b3 Precedence: list Reply-To: ALT Linux Team development discussions List-Id: ALT Linux Team development discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Feb 2009 09:16:00 -0000 Archived-At: List-Archive: List-Post: This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig263560BF0E143DDD0C1B255C Content-Type: text/plain; charset=KOI8-R; format=flowed Content-Transfer-Encoding: quoted-printable Eugene Prokopiev =D0=C9=DB=C5=D4: >>>>>> =F3=D5=DD=C5=D3=D4=D7=D5=C5=D4 =CC=C9 =C2=CF=CC=C5=C5 =D0=D2=C1=D7= =C9=CC=D8=CE=D9=CA =D3=D0=CF=D3=CF=C2 =D3=C4=C5=CC=C1=D4=D8 git merge -s = ours >>>>>> =CE=C1=CF=C2=CF=D2=CF=D4 (=DA=C1=D4=C5=D2=C5=D4=D8 =D7=D3=C5, =DE=D4= =CF =C5=D3=D4=D8 =D7 =D4=C5=CB=D5=DD=C5=CD =C2=D2=C1=CE=DE=C5 =D3=CF=C4=C5= =D2=D6=C9=CD=D9=CD =C4=D2=D5=C7=CF=C7=CF >>>>>> =C2=D2=C1=CE=DE=C1), =DE=C5=CD =D0=C5=D2=C5=CE=CF=D3 =C6=C1=CA=CC=CF= =D7 =D3 =D0=CF=CD=CF=DD=D8=C0 git archive? >>>>>> >>>>>> >>>>> git branche -f ? >>>>> >>>>> >>>> =F4=CF=DE=CE=C5=C5, =D0=CF=D3=CC=C5=C4=CF=D7=C1=D4=C5=CC=D8=CE=CF=D3= =D4=D8 =C9=DA: >>>> >>>> 1. git branch <=C2=D2=C1=CE=DE> <=C2=D2=C1=CE=DE>.old >>>> >>>> 2. git branch -f <=DE=C5=CD =DA=C1=D4=C9=D2=C1=C5=CD> <=C2=D2=C1=CE= =DE> >>>> >>>> 3. git checkout <=C2=D2=C1=CE=DE> >>>> >>>> 4. git pull -s ours . <=C2=D2=C1=CE=DE>.old >>>> >> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ >> >>> =E1 =D0=D2=CF=CA=C4=C5=D4 =CC=C9 =D0=CF=D4=CF=CD =D0=D2=CF=D7=C5=D2=CB= =C1 =CE=C1=D3=CC=C5=C4=CF=D7=C1=CE=C9=D1 =CB=CF=CD=CD=C9=D4=CF=CD =C9=DA = <=C2=D2=C1=CE=DE> =CB=CF=CD=CD=C9=D4=CF=D7 >>> =C9=DA <=C2=D2=C1=CE=DE>.old =D0=D2=C9 =D3=C2=CF=D2=CB=C5 =D7 git.alt= ? >>> >> =E4=CF=CC=D6=CE=C1, =D4. =CB. <=C2=D2=C1=CE=DE>.old =C2=D5=C4=C5=D4 = =D7 =DE=C9=D3=CC=C5 =D0=D2=C5=C4=CB=CF=D7 =D7=D3=C5=C8 =CB=CF=CD=CD=C9=D4= =CF=D7 =D7 <=C2=D2=C1=CE=DE>, >> =CE=C1=DE=C9=CE=C1=D1 =D3 =D0=CF=CC=D5=DE=C5=CE=CE=CF=C7=CF =D7 =D0. 4= =2E >=20 > =C9 =D5=C4=C1=CC=C5=CE=C9=C5 <=C2=D2=C1=CE=DE>.old =DC=D4=CF=CD=D5 =CE=C5= =D0=CF=CD=C5=DB=C1=C5=D4? =EE=C5 =D0=CF=CD=C5=DB=C1=C5=D4: =D3=C9=D3=D4=C5=CD=C1 =C9=CD=C5=C5=D4= =C4=C5=CC=C1 =D3 =CB=CF=CD=CD=C9=D4=C1=CD=C9, =C1 =CE=C5 =D3 =C2=D2=C1=CE= =DE=C1=CD=C9. >=20 > =CD=CE=C5 =CB=C1=D6=C5=D4=D3=D1, =DE=D4=CF =D3=C8=C5=CD=C1 =D7=D3=C5-=D4= =C1=CB=C9 =D3=CC=C9=DB=CB=CF=CD =DA=C1=CD=CF=D2=CF=DE=C5=CE=CE=C1=D1, git= merge + git > archive =D7 =CB=C1=DE=C5=D3=D4=D7=C5 =D3=D2=C5=C4=D3=D4=D7=C1 =D2=C1=DA= =D2=C5=DB=C5=CE=C9=D1 =CB=CF=CE=C6=CC=C9=CB=D4=CF=D7 =D7=D9=C7=CC=D1=C4=C9= =D4 =D0=D2=CF=DD=C5 ;) =E4=C1. =E5=DD=A3 =D0=D2=CF=DD=C5 -- mv =C9 git checkout -f =D0=C5=D2=C5= =C4 git merge/pull -s ;-) --=20 =F3 =D5=D7=C1=D6=C5=CE=C9=C5=CD. =E1=CC=C5=CB=D3=C5=CA. --------------enig263560BF0E143DDD0C1B255C Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iQEcBAEBAgAGBQJJk+lUAAoJED0KZX1FX4J6Y90IAL8KubmCWof1W4yxVdPZZfwe 3LUQiQsPke+fqUHXd3GiAwtyStgce4sDPAASlPb5fFL5l7qXcmpZHzaZS1IqTXAr TaNPXOZKkySPsThpsqqjuuKWN4W0WhIVOF/EOrdZTCsh1sHjQFdpMr0B4qVeAhqT he5SAePEU+7U5nXCqqaPwEVTgiyrbdD77wiOinBGSEFvxy7bjs58od4nDjlHt0fD cwP2xayLjqTxrRafZKSPSZAMh//NVS5deo+KNl1WzBuNiJ/uENUnIw8DaQlI5TJt FIOF2WHv4e4BZvzN3I0y6SIQaxhsEQsaeCyOkeNjgTBP0rtPXOB4Yib8x8/iDV8= =vzxi -----END PGP SIGNATURE----- --------------enig263560BF0E143DDD0C1B255C--