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 19:54:03 +0300 From: Afanasov Dmitry To: devel@lists.altlinux.org Message-ID: <20100110165401.GB8442@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> <20100110163712.GC7792@altlinux.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="mojUlQ0s9EVzWg2t" Content-Disposition: inline In-Reply-To: <20100110163712.GC7792@altlinux.org> 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 16:54:22 -0000 Archived-At: List-Archive: List-Post: --mojUlQ0s9EVzWg2t Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Jan 10, 2010 at 07:37:13PM +0300, Alexey I. Froloff 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. > git fetch, lol! =C4=C1 =CB=D4=CF =C2=D9 =D3=D0=CF=D2=C9=CC! =D4=C1=CB =C9 =D2=C1=C2=CF=D4= =C1=C5=CD: git fetch ref=3D``git merge-base master origin/master` [ "$ref" =3D "`git rev-parse HEAD`" ] && git merge =C8=CF=D4=D1 =DC=D4=CF=D4 =C9=DA=D7=D2=C1=D4 =CB=CF=CE=C5=DE=CE=CF =DA=C1= =CD=C5=CE=D1=C0 =CE=C1 qgit master origin/master :) =CB=D4=CF =D7=D3=D0=CF=CD=CE=C9=D4 =D0=D2=CF -ff: --ff, --no-ff Do not generate a merge commit if the merge resolved as a fast-forward, only update the branch pointer. =CB =D3=CF=D6=C1=CC=C5=CE=C9=C0 =D4=D5=D4 "if resolved". =C5=D3=CC=C9 not r= esolved, =D4=CF =D0=D2=CF=D3=C8=CF=C4=C9=D4 =CF=C2=D9=DE=CE=D9=CA merge, =C1 =D1 =C5=C7=CF =C8=CF=DE=D5 =DA=C1=D0=D2=C5=D4=C9=D4=D8, =D0=CF= =CB=C1 =CE=C5 =C2=D5=C4=C5=D4 =D3=CB=C1=DA=C1=CE=CF =C4=CF=D0=CF=CC=CE=C9= =D4=C5=CC=D8=CE=CF. --=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 --mojUlQ0s9EVzWg2t 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) iEYEARECAAYFAktKBikACgkQ72GKvac0IyxnrwCeJMVpC7kY3XP+eFAAo8hZSf/w pNkAnRniVtVpwhekTGrliV1vbffNcdDf =thy2 -----END PGP SIGNATURE----- --mojUlQ0s9EVzWg2t--