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.0 required=5.0 tests=AWL, BAYES_00, FH_DATE_PAST_20XX autolearn=no version=3.2.5 Sender: =?UTF-8?B?0JTQtdC90LjRgSDQodC80LjRgNC90L7Qsg==?= Date: Sun, 10 Jan 2010 22:39:44 +0300 From: =?koi8-r?B?5MXOydMg883J0s7P1w==?= To: ALT Linux Team development discussions Message-ID: <20100110193944.GD8903@mw.office.seiros.ru> 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="x4pBfXISqBoDm8sr" Content-Disposition: inline In-Reply-To: <20100110173327.GA5951@atlas.home> Subject: Re: [devel] =?koi8-r?b?zyDL1czY1NXSxSDSwcLP1Nkg0yBnaXQt0sXQz9rJ1M/S?= =?koi8-r?b?ydHNySAod2FzOiBbU0NNXSBwYWNrYWdlcy9xZW11OiBoZWFkcy9tYXN0ZXIp?= 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 19:39:53 -0000 Archived-At: List-Archive: List-Post: --x4pBfXISqBoDm8sr 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: SV> =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; SV> =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. =EF=CA, =D3=D0=C1=D3=C9=C2=CF! --=20 =F3 =D5=D7=C1=D6=C5=CE=C9=C5=CD, =E4=C5=CE=C9=D3 http://freesource.info ---------------------------------------------------------------------------- --x4pBfXISqBoDm8sr Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iEYEARECAAYFAktKLQAACgkQPuR8c4jhFKIFEQCfWobOQxme0u6+vNbKfhUbd1rA nUAAnjNRmh9no7617vDZa58LElM0tlg7 =XqiP -----END PGP SIGNATURE----- --x4pBfXISqBoDm8sr--