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=unavailable version=3.2.5 Date: Mon, 8 Dec 2008 13:28:34 +0300 From: Sergey Vlasov To: devel@lists.altlinux.org Message-ID: <20081208102834.GY30445@newmaster.mivlgu.local> Mail-Followup-To: devel@lists.altlinux.org References: <200812071806.56364.ledest@gmail.com> <200812080312.02882.ledest@gmail.com> <20081208061957.GB16378@epbyminw8406h.minsk.epam.com> <200812081049.13122.ledest@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="BlkQeOBdElZ1aiuH" Content-Disposition: inline In-Reply-To: <200812081049.13122.ledest@gmail.com> Subject: Re: [devel] gear-rules and submodules 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: Mon, 08 Dec 2008 10:28:41 -0000 Archived-At: List-Archive: List-Post: --BlkQeOBdElZ1aiuH Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Dec 08, 2008 at 10:49:13AM +0200, Led wrote: [...] > > > > -s subtree. > > > > > > =EE=C1=D0=D2=C9=CD=C5=D2? =EB=C1=CB =D5=CB=C1=DA=C1=D4=D8 =CB=C1=D4= =C1=CC=CF=C7, =D7 =CB=CF=D4=CF=D2=D9=CA =CE=D5=D6=CE=CF =CD=C5=D2=C4=D6=C9= =D4=D8? > > > > http://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtr= ee.h > >tml >=20 > =F3=D0=C1=D3=C9=C2=CF! =EE=CF, =CB=C1=CB =D7=C9=D6=D5, =C2=C5=DA read-tre= e =D7=D3=A3 =D6=C5 =CE=C5 =CF=C2=CF=CA=D4=C9=D3=D8 - =DC=D4=CF =D1 =CB=C1= =CB =D2=C1=DA=20 > =CE=C1=DB=A3=CC:) > =E1 =D0=D2=CF =DA=C1=CB=CC=C0=DE=C9=D4=C5=CC=D8=CE=D9=CA "git pull -s sub= tree" =CE=C5 =DA=CE=C1=CC. =F3=C5=CA=DE=C1=D3 =D0=CF=D0=D2=CF=C2=D5=C0. >=20 > P.S. =E1 merge =D7=D3=A3 =D4=C1=CB=C9 =D3 "-s ours", =C1 =CE=C5 "-s subtr= ee":) =F0=C5=D2=D7=D9=CA =D2=C1=DA =C4=C5=CC=C1=C5=D4=D3=D1 merge --no-commit -s = ours, =D0=CF=D4=CF=CD =C6=CF=CB=D5=D3=D9 =D3 read-tree. =F0=D2=C9 =D0=CF=D3=CC=C5=C4=D5=C0=DD=C9=C8 =CF=C2=CE=CF=D7=CC=C5=CE=C9=D1= =C8 =C4=CF=D3=D4=C1=D4=CF=DE=CE=CF git merge -s subtree. --BlkQeOBdElZ1aiuH Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (GNU/Linux) iD8DBQFJPPbSW82GfkQfsqIRAnFCAJ9hjqEQH7GLQ98sCoBfxDiQK8qFNgCdE2/k 9EpHnPqKynVBlkR2ffmxYlA= =lCqF -----END PGP SIGNATURE----- --BlkQeOBdElZ1aiuH--