From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <wrar@altlinux.ru>
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.0 required=5.0 tests=AWL,BAYES_00 autolearn=ham
	version=3.2.5
Date: Thu, 12 Feb 2009 13:02:45 +0500
From: Andrey Rahmatullin <wrar@altlinux.ru>
To: devel@lists.altlinux.org
Message-ID: <20090212080245.GZ6341@wrars-comp.wrarsdomain>
References: <f7a739430902112318q5d77dd09x8b35622b93ec917f@mail.gmail.com>
	<4993D6E4.9040802@solin.spb.ru>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="9CzcV6dAFIr7O1Ie"
Content-Disposition: inline
In-Reply-To: <4993D6E4.9040802@solin.spb.ru>
X-Operating-System: ALT Linux Sisyphus
X-Jabber-Id: wrar@altlinux.org
User-Agent: Mutt/1.5.18 (2008-10-30)
Subject: Re: [devel] =?koi8-r?b?Z2l0IG1lcmdlIC1zIG91cnMgzsHPws/Sz9Q=?=
X-BeenThere: devel@lists.altlinux.org
X-Mailman-Version: 2.1.10b3
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: Thu, 12 Feb 2009 08:02:48 -0000
Archived-At: <http://lore.altlinux.org/devel/20090212080245.GZ6341@wrars-comp.wrarsdomain/>
List-Archive: <http://lore.altlinux.org/devel/>
List-Post: <mailto:devel@altlinux.org>


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

On Thu, Feb 12, 2009 at 10:59:32AM +0300, Aleksey Avdeev wrote:
> > =F3=D5=DD=C5=D3=D4=D7=D5=C5=D4 =CC=C9 =C2=CF=CC=C5=C5 =D0=D2=C1=D7=C9=
=CC=D8=CE=D9=CA =D3=D0=CF=D3=CF=C2 =D3=C4=C5=CC=C1=D4=D8 git merge -s ours
> > =CE=C1=CF=C2=CF=D2=CF=D4 (=DA=C1=D4=C5=D2=C5=D4=D8 =D7=D3=C5, =DE=D4=CF=
 =C5=D3=D4=D8 =D7 =D4=C5=CB=D5=DD=C5=CD =C2=D2=C1=CE=DE=C5 =D3=CF=C4=C5=D2=
=D6=C9=CD=D9=CD =C4=D2=D5=C7=CF=C7=CF
> > =C2=D2=C1=CE=DE=C1), =DE=C5=CD =D0=C5=D2=C5=CE=CF=D3 =C6=C1=CA=CC=CF=D7=
 =D3 =D0=CF=CD=CF=DD=D8=C0 git archive?
>    git branche -f ?
git reset --hard? :)

=F1 =D0=D2=C1=D7=C4=C1 =CE=C5 =D5=D7=C5=D2=C5=CE, =DE=D4=CF =D0=CF=CE=D1=CC=
 =DA=C1=C4=C1=DE=D5.

--=20
WBR, wRAR (ALT Linux Team)
Powered by the ALT Linux fortune(8):

<raorn> ssh -n git.alt acl sisyphus librep add raorn
<dottedmag> raorn: -n =CE=C5 =CE=D5=D6=C5=CE
<raorn> dottedmag: =C8=D5=D6=C5 =CF=D4 =CE=C5=C7=CF =CE=C5 =C2=D5=C4=C5=D4
<dottedmag> raorn: =D4=CF=C7=C4=C1 ssh -n -o AddressFamily=3Dinet -o BatchM=
ode=3Dyes -o
            Cipher=3Ddes git.alt ... :)

--9CzcV6dAFIr7O1Ie
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEARECAAYFAkmT16QACgkQB4Vf7hFmt5VrowCeO4zcrMka3FfDCQRb5tkrG9KI
/uUAni3av7FNbiSP1lH+O/XX4WADuUzL
=fsOW
-----END PGP SIGNATURE-----

--9CzcV6dAFIr7O1Ie--