From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <raorn@cnt.ru>
Date: Wed, 10 Oct 2007 13:39:56 +0400
From: "Alexey I. Froloff" <raorn@immo.ru>
To: ALT Devel discussion list <devel@lists.altlinux.org>
Message-ID: <20071010093956.GA2062@hell.fortress>
References: <20071010001705.GA13211@lks.home>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="xHFwDpU9dbj6ez1V"
Content-Disposition: inline
In-Reply-To: <20071010001705.GA13211@lks.home>
User-Agent: Mutt/1.5.16 (2007-06-09)
Subject: Re: [devel] Q: git fake merge
X-BeenThere: devel@lists.altlinux.org
X-Mailman-Version: 2.1.9
Precedence: list
Reply-To: ALT Linux Team development discussions <devel@lists.altlinux.org>
List-Id: ALT Linux Team development discussions <devel.lists.altlinux.org>
List-Unsubscribe: <https://lists.altlinux.org/mailman/listinfo/devel>,
	<mailto:devel-request@lists.altlinux.org?subject=unsubscribe>
List-Archive: <http://lists.altlinux.org/pipermail/devel>
List-Post: <mailto:devel@lists.altlinux.org>
List-Help: <mailto:devel-request@lists.altlinux.org?subject=help>
List-Subscribe: <https://lists.altlinux.org/mailman/listinfo/devel>,
	<mailto:devel-request@lists.altlinux.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Oct 2007 09:39:58 -0000
Archived-At: <http://lore.altlinux.org/devel/20071010093956.GA2062@hell.fortress/>
List-Archive: <http://lore.altlinux.org/devel/>
List-Post: <mailto:devel@altlinux.org>


--xHFwDpU9dbj6ez1V
Content-Type: text/plain; charset=koi8-r
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

* Konstantin A. Lepikhov <lakostis@> [071010 13:35]:
> =E4=CF=D0=D5=D3=D4=C9=CD, =D5 =CD=C5=CE=D1 =C5=D3=D4=D8 =CE=C5=CB=C9=CA =
=C2=D2=C1=CE=DE, =D7 =CB=CF=D4=CF=D2=D9=CA =D1 =C8=CF=DE=D5 =D1=CB=CF=C2=D9=
 =D3=CD=C5=D2=D6=C9=D4=D8 =CE=C5=CB=C9=CA
> =C4=D2=D5=C7=CF=CA =C2=D2=C1=CE=DE. =FE=D4=CF =DA=CE=C1=DE=C9=D4 "=D1=CB=
=CF=C2=D9" - =DE=D4=CF=C2=D9 =D0=CF-=C6=C1=CB=D4=D5 =D4=C1=CD =CE=C5 =CD=C5=
=CE=D1=CC=C9=D3=D8,
> =CF=C2=CE=CF=D7=C9=CC=C1=D3=D8 =D4=CF=CC=D8=CB=CF =C9=D3=D4=CF=D2=C9=D1 =
=CB=CF=CD=CD=C9=D4=CF=D7. =EB=C1=CB =DC=D4=CF =CD=CF=D6=CE=CF =D3=C4=C5=CC=
=C1=D4=D8?
=F0=D2=CF=D3=D4=CF "=D0=D2=C9=C3=C5=D0=C9=D4=D8" =C4=D2=D5=C7=CF=CA =C2=D2=
=C1=CE=DE?

git pull -s ours . branch

--=20
Regards,
Sir Raorn.

--xHFwDpU9dbj6ez1V
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)

iD8DBQFHDJ3nVqT7+fkT8woRAiMxAKDTv0fOzlfHnABH42Vdlhk3Yt68+wCgmauM
ZLaQa0fgMdLHI9sUyF3EFDo=
=AC6h
-----END PGP SIGNATURE-----

--xHFwDpU9dbj6ez1V--