From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Sat, 16 Sep 2006 17:48:46 +0400 From: "Dmitry V. Levin" To: ALT Devel discussion list Message-ID: <20060916134846.GA3488@basalt.office.altlinux.org> Mail-Followup-To: ALT Devel discussion list References: <20060916063731.GS17693@localhost.localdomain> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="WIyZ46R2i8wDzkSu" Content-Disposition: inline In-Reply-To: <20060916063731.GS17693@localhost.localdomain> X-fingerprint: FE4C 93AB E19A 2E4C CB5D 3E4E 7CAB E6AC 9E35 361E Subject: Re: [devel] cairo.git X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.9rc1 Precedence: list Reply-To: ALT Devel discussion list List-Id: ALT Devel discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Sep 2006 13:48:46 -0000 Archived-At: List-Archive: List-Post: --WIyZ46R2i8wDzkSu Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Sep 16, 2006 at 10:37:31AM +0400, Alexey Tourbin wrote: > $ git clone git://git.cairographics.org/git/cairo [...] > $ cat .git/remotes/origin=20 > URL: git://git.cairographics.org/git/cairo > Pull: refs/heads/master:refs/heads/origin > Pull: refs/heads/1.2:refs/heads/1.2 > Pull: refs/heads/1.0:refs/heads/1.0 > Pull: refs/heads/ps-surface:refs/heads/ps-surface > Pull: refs/heads/surface-internals:refs/heads/surface-internals [...] > =EB=C1=CB =D1 =D0=CF=CE=D1=CC =C2=D2=C1=CE=DE master =D4=C5=D0=C5=D2=D8 = =D1=D7=CC=D1=C5=D4=D3=D1 =CB=CF=D0=C9=C5=CA origin, =FC=D4=CF =CE=C5 =D3=CC=C5=C4=D5=C5=D4 =C9=DA =D7=D9=DB=C5=D0=D2=CF=C3=C9= =D4=C9=D2=CF=D7=C1=CE=CE=CF=C7=CF. =F4=C1=CD =CE=C1=D0=C9=D3=C1=CE=CF, =DE= =D4=CF refs/heads/master =C9=DA git://git.cairographics.org/git/cairo =C2=D5=C4=C5= =D4 =CB=CF=D0=C9=D2=CF=D7=C1=D4=D8=D3=D1 =D7 =CC=CF=CB=C1=CC=D8=CE=D9=CA refs/h= eads/origin. > =ED=CE=C5 =D6=C5 =CE=D5=D6=CE=CF =D3=CF=C2=C9=D2=C1=D4=D8 =D0=C1=CB=C5=D4= =CE=C1 =CF=D3=CE=CF=D7=C5 > =C2=D2=C1=CE=DE=C1 1.2. =EB=C1=CB =DC=D4=CF =D0=D2=C1=D7=C9=CC=D8=CE=CF = =D3=C4=C5=CC=C1=D4=D8? =F1 =D4=C1=CB =D0=CF=CE=C9=CD=C1=C0 =CE=C1=C4=CF = =D3=C4=C5=CC=C1=D4=D8 =D7=CF=D4 > =DE=D4=CF: =F3=D0=C5=D2=D7=C1 =CE=C1=C4=CF =C4=CF=DE=C9=D4=C1=D4=D8 =D7=D3=C5 "Note" = =D7 git-pull(1), =D4=C1=CD =CE=C1=D0=C9=D3=C1=CE=CF, =CB=C1=CB =C9=CD=C5=CE= =CE=CF =D0=D2=CF=C9=D3=C8=CF=C4=C9=D4 merge =C9 =CB=C1=CB =CC=D5=DE=DB=C5 =CF=C2= =D5=D3=D4=D2=CF=C9=D4=D8 .git/remotes/origin. > $ git-branch -D master > $ git-checkout -b master 1.2 =F7=C9=C4=C9=CD=CF =C4=C1. > $ sed -i s,/master:refs/heads/origin,/master:refs/heads/1.2, .git/remotes= /origin =EE=C9 =D7 =CB=CF=C5=CD =D3=CC=D5=DE=C1=C5. > =F0=CF=D3=CC=C5 =DC=D4=CF=C7=CF =CD=CF=CA master =C2=D5=C4=C5=D4 =CE=C1= =D3=D4=D2=CF=C5=CE =CE=C1 =C9=C8=CE=C9=CA 1.2. =F0=CF=D3=CC=C5 =DC=D4=CF=C7=CF =C9=C8 master =C2=D5=C4=C5=D4 =CE=C1=D3=D4= =D2=CF=C5=CE =CE=C1 =D4=D7=CF=CA refs/heads/1.2! > =EB=C1=CB =D4=CF=C7=C4=C1 =CE=C1=DA=D7=C1=D4=D8 > =C2=D2=C1=CE=DE, =CB=CF=D4=CF=D2=D9=CA =D3=CF=CF=D4=D7=C5=D4=D3=D4=D7=D5= =C5=D4 =D0=D2=C5=C4=D9=C4=D5=DD=C5=CD=D5 master, =D4.=C5. =C9=C8=CE=C5=CD= =D5 origin? =E4=CF=D3=D4=C1=D4=CF=DE=CE=CF =D3=C4=C5=CC=C1=D4=D8 =D3=D4=D2=CF=CB=D5 Pull: refs/heads/1.2:refs/heads/1.2 =D0=C5=D2=D7=D9=CD Pull'=CF=CD. =F7=CF=D4 =C5=D3=CC=C9 =C4=C5=CC=C1=D4=D8 Push, =D4=CF=C7=C4=C1 origin =CC= =D5=DE=DB=C5 =D0=C5=D2=C5=C9=CD=C5=CE=CF=D7=C1=D4=D8. --=20 ldv --WIyZ46R2i8wDzkSu Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) iD8DBQFFDAC+fKvmrJ41Nh4RAnRuAJ9himrYMC81reKjCAvWyJZ04RFiXQCdFQAH PJfx9njzoxmBvVTUdESErrc= =sPLi -----END PGP SIGNATURE----- --WIyZ46R2i8wDzkSu--