From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <vsu@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.6 required=5.0 tests=BAYES_00 autolearn=ham
	version=3.2.5
Date: Thu, 18 Dec 2008 15:05:48 +0300
From: Sergey Vlasov <vsu@altlinux.ru>
To: devel@lists.altlinux.org
Message-ID: <20081218120548.GC30445@newmaster.mivlgu.local>
Mail-Followup-To: devel@lists.altlinux.org
References: <E1LDFiv-0009xN-00.a_mdl-mail-ru@f134.mail.ru>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="McQJJYUzjTUqtsGv"
Content-Disposition: inline
In-Reply-To: <E1LDFiv-0009xN-00.a_mdl-mail-ru@f134.mail.ru>
Subject: Re: [devel] git question.
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, 18 Dec 2008 12:05:56 -0000
Archived-At: <http://lore.altlinux.org/devel/20081218120548.GC30445@newmaster.mivlgu.local/>
List-Archive: <http://lore.altlinux.org/devel/>
List-Post: <mailto:devel@altlinux.org>


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

On Thu, Dec 18, 2008 at 01:03:17PM +0300, Denis Medvedev wrote:
> =EB=C1=CB=C1=D1 =D0=D2=C1=D7=C9=CC=D8=CE=C1=D1 =D0=D2=CF=C3=C5=C4=D5=D2=
=C1 =D0=CF=C4=CE=D1=D4=C9=D1 =D7=C5=D2=D3=C9=C9 =D0=D2=C9 =D2=C1=C2=CF=D4=
=C5 =D7 git?
> =F5 =CD=C5=CE=D1 =C2=D9=CC xxx-1.0.tar.gz=20
> =F1 =C5=C7=CF =DA=C1=CC=C9=CC =D7 =C7=C9=D4, =D0=CF=CD=D5=DE=C1=CC(=CB=CF=
=CD=CD=C9=D4=D9 =C5=D3=D4=D8), =CF=D0=C1=CB=C5=D4=C9=CC =C4=CC=D1 =D3=C9=DA=
=C9=C6=C1.
> =F7=D9=DB=C5=CC xxx-2.0.tar.gz
> =F1 =D0=CF=D0=D2=CF=C2=CF=D7=C1=CC =D3=C4=C5=CC=C1=D4=D8 =D3=CC=C5=C4=D5=
=C0=DD=C5=C5:
> git-branch 2.0

=E2=D2=C1=CE=DE =CE=C1=C4=CF =D3=CF=DA=C4=C1=D7=C1=D4=D8 =CF=D4 =D4=CF=C7=
=CF =CB=CF=CD=CD=C9=D4=C1, =CB=CF=D4=CF=D2=D9=CA =D3=CF=C4=C5=D2=D6=C1=CC =
=CE=C5=C9=DA=CD=C5=CE=A3=CE=CE=D9=C5
=C9=D3=C8=CF=C4=CE=C9=CB=C9 =D0=D2=C5=C4=D9=C4=D5=DD=C5=CA =D7=C5=D2=D3=C9=
=C9.  =F4.=C5., =D4=C5=D0=C5=D2=D8 =D0=D2=C9=C4=A3=D4=D3=D1 =CE=C1=CA=D4=C9=
 =DC=D4=CF=D4 =CB=CF=CD=CD=C9=D4
(=CE=C1=D0=D2=C9=CD=C5=D2, =D7 gitk), =D0=CF=D3=CC=C5 =DE=C5=C7=CF =D7=D9=
=D0=CF=CC=CE=C9=D4=D8

  git checkout -b upstream $commit_with_old_version

=E4=C1=CC=C5=C5 =CF=C2=CE=CF=D7=C9=D4=D8 =C9=D3=C8=CF=C4=CE=C9=CB=C9 (=CE=
=C1=D0=D2=C9=CD=C5=D2, =DE=C5=D2=C5=DA gear-update), =DA=C1=CB=CF=CD=CD=C9=
=D4=C9=D4=D8
=C9=DA=CD=C5=CE=C5=CE=C9=D1, =D0=CF=D3=CC=C5 =DE=C5=C7=CF

  git checkout master
  git merge upstream

=F0=D2=C9 =D3=CC=C5=C4=D5=DD=C9=C8 =CF=C2=CE=CF=D7=CC=C5=CE=C9=D1=C8 =CD=CF=
=D6=CE=CF =D0=D2=CF=D3=D4=CF =C4=CF=C2=C1=D7=CC=D1=D4=D8 =CE=CF=D7=D9=C5 =
=D7=C5=D2=D3=C9=C9 =D7 =C2=D2=C1=CE=DE
upstream =C9 =CD=C5=D2=D6=C9=D4=D8 =D7 master.

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

iD8DBQFJSjycW82GfkQfsqIRAtzbAJ9a4ImlBJQhcXqmbTQTYtdRuMQ3zACfeEo1
OMoNtQ3xZPAl7lPGG6a605M=
=qgq3
-----END PGP SIGNATURE-----

--McQJJYUzjTUqtsGv--