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=0.6 required=5.0 tests=BAYES_00,FH_DATE_PAST_20XX, SPF_PASS autolearn=no version=3.2.5 Date: Sun, 10 Jan 2010 20:51:54 +0300 From: Afanasov Dmitry To: devel@lists.altlinux.org Message-ID: <20100110175153.GH8442@utvuk.ender.rk> Mail-Followup-To: devel@lists.altlinux.org References: <20091230210652.GB11482@wo.int.altlinux.org> <4B3BC2E9.8020903@solin.spb.ru> <20091230220500.GD11482@wo.int.altlinux.org> <4B3BD6A6.5030400@solin.spb.ru> <20100110010813.GC32241@wo.int.altlinux.org> <20100110113254.GJ1710@osdn.org.ua> <20100110131954.GA23758@ender.fondinvestrk.ru> <20100110154300.GB29917@mw.office.seiros.ru> <20100110162204.GA8442@utvuk.ender.rk> <20100110173327.GA5951@atlas.home> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="y0Ed1hDcWxc3B7cn" Content-Disposition: inline In-Reply-To: <20100110173327.GA5951@atlas.home> User-Agent: Mutt/1.5.20 (2009-06-23) Subject: Re: [devel] =?koi8-r?b?zyDL1czY1NXSxSDSwcLP1Nkg0yBnaXQt0sXQz9rJ1M/S?= =?koi8-r?b?ydHNySAod2FzOiBbU0NNXSBwYWNrYWdlcy9xZW11OiBoZWFkcy9t?= =?koi8-r?b?YXN0ZXIp?= X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.12 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: Sun, 10 Jan 2010 17:52:11 -0000 Archived-At: List-Archive: List-Post: --y0Ed1hDcWxc3B7cn Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Jan 10, 2010 at 08:33:27PM +0300, Sergey Vlasov wrote: > On Sun, Jan 10, 2010 at 07:22:05PM +0300, Afanasov Dmitry wrote: > > =CB=D3=D4=C1=D4=C9, git push =D7=D0=CF=CC=CE=C5 =D3=C5=C2=C5 =D0=D2=C1= =D7=C9=CC=D8=CE=D9=CA - non fast forward =D4=CF=CC=D8=CB=CF =D0=CF -f. =C1 > > =CB=C1=CB =D4=C1=CB=CF=C5 =D6=C5 =D3=C4=C5=CC=C1=D4=D8 =D3 git pull? = =D1 =D4=C1=CB =C9 =CE=C5 =CE=C1=DB=C5=CC =D3=D0=CF=D3=CF=C2=C1 =DA=C1=D0=D2= =C5=D4=C9=D4=D8 =C5=CD=D5 > > merge, =CF=D3=D4=C1=D7=C9=D7 =D4=CF=CC=D8=CB=CF fast-forward. >=20 > =F7 git >=3D 1.6.6 =D5 =CB=CF=CD=C1=CE=C4 git merge =C9 git pull =C5=D3= =D4=D8 =CF=D0=C3=C9=D1 --ff-only; > =D0=D2=C9 =D6=C5=CC=C1=CE=C9=C9 =CD=CF=D6=CE=CF =D5=CB=C1=DA=C1=D4=D8 =C5= =A3 =C4=C1=D6=C5 =D7 branch..mergeoptions. =C2=CC=C1=C7=CF=C4=C1=D2=C0. =DA=CE=C1=DE=C9=D4 =CD=CE=C5 =CE=C5 =C8=CF=DE= =C5=D4=D3=D1 =CF=DE=C5=D2=C5=C4=CE=CF=CA =D2=C1=DA =D3=D4=D2=C1=CE=CE=CF=C7= =CF :) =D0=CF=CB=C1 =D5 =CE=C1=D3 git-1.6.5.7-alt1. =C2=D5=C4=C5=CD =C9=CD=C5=D4= =D8 =D7 =D7=C9=C4=D5. --=20 =F3 =D5=D7=C1=D6=C5=CE=C9=C5=CD =E1=C6=C1=CE=C1=D3=CF=D7 =E4=CD=C9=D4=D2=C9=CA --y0Ed1hDcWxc3B7cn Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.13 (GNU/Linux) iEYEARECAAYFAktKE7kACgkQ72GKvac0IywwkQCeKS4NXt2z9GbjCKrG02Sdmogd lHsAn3SlslnP4LlXON6VAk0un3XedcAb =3UNe -----END PGP SIGNATURE----- --y0Ed1hDcWxc3B7cn--