From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Virus-Scanned: amavisd-new at velesys.com Date: Sat, 9 Jun 2007 11:09:08 +0300 From: "Kirill A. Shutemov" To: ALT Devel discussion list Message-ID: <20070609080908.GA22294@localhost.localdomain> References: <466A3708.3060806@stc.donpac.ru> <20070609072440.GA3142@localhost.localdomain> <466A5DA2.9030208@stc.donpac.ru> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="AqsLC8rIMeq19msA" Content-Disposition: inline In-Reply-To: <466A5DA2.9030208@stc.donpac.ru> X-Operating-System: ALT Linux Sisyphus (20070423) (Kernel 2.6.18-wks-smp-alt2) User-Agent: Mutt/1.5.14 (2007-02-12) Subject: Re: [devel] git-fetch : not updating to non-fast forward branch 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, 09 Jun 2007 08:37:17 -0000 Archived-At: List-Archive: List-Post: --AqsLC8rIMeq19msA Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On [Sat, 09.06.2007 11:58], Eugene Prokopiev wrote: > > =D0=AD=D1=82=D0=BE =D0=B7=D0=BD=D0=B0=D1=87=D0=B8=D1=82, =D1=87=D1=82= =D0=BE =D0=B2=D0=B0=D1=88 refs/heads/dbmail_2_2 =D0=BD=D0=B5 =D1=8F=D0=B2= =D0=BB=D1=8F=D0=B5=D1=82=D1=81=D1=8F =D0=BF=D1=80=D0=B5=D0=B4=D0=BA=D0=BE= =D0=BC > > refs/heads/dbmail_2_2. =D0=92=D0=B5=D1=80=D0=BE=D1=8F=D1=82=D0=BD=D0=B5= =D0=B9 =D0=B2=D1=81=D0=B5=D0=B3=D0=BE, =D0=B2=D1=8B =D0=B2 =D0=BD=D0=B5=D0= =B3=D0=BE =D1=87=D0=B5=D0=B3=D0=BE-=D0=BD=D0=B8=D1=82=D1=8C =D0=BA=D0=BE=D0= =BC=D0=B8=D1=82=D0=B8=D0=BB=D0=B8 =D0=B2 > > =D0=BD=D0=B5=D0=B3=D0=BE =D0=B8=D0=BB=D0=B8 upstream =D0=B8=D1=81=D1=82= =D0=BE=D1=80=D0=B8=D1=8E =D0=BB=D0=BE=D0=BC=D0=B0=D0=BB(=D1=87=D1=82=D0=BE = =D0=BC=D0=B5=D0=BD=D0=B5=D0=B5 =D0=B2=D0=B5=D1=80=D0=BE=D1=8F=D1=82=D0=BD= =D0=BE). git fetch =D0=BD=D0=B5 =D0=BC=D0=B5=D1=80=D0=B6=D0=B8=D1=82, > > =D0=B0 =D1=82=D0=BE=D0=BB=D0=BA=D0=BE =D0=B7=D0=B0=D0=B1=D0=B8=D1=80=D0= =B0=D0=B5=D1=82. >=20 > =D0=BC=D0=BE=D0=B8 =D0=BA=D0=BE=D0=BC=D0=BC=D0=B8=D1=82=D1=8B =D0=B2 =D0= =B4=D1=80=D1=83=D0=B3=D0=BE=D0=BC =D0=B1=D1=80=D0=B0=D0=BD=D1=87=D0=B5, =D0= =B0 =D0=B0=D0=BF=D1=81=D1=82=D0=B8=D0=BC =D0=BB=D0=BE=D0=BC=D0=B0=D1=82=D1= =8C, =D0=BF=D0=BE=D1=85=D0=BE=D0=B6=D0=B5, =D0=BC=D0=BE=D0=B3 :( >=20 > =D1=87=D1=82=D0=BE =D0=B2 =D1=82=D0=B0=D0=BA=D0=BE=D0=BC =D1=81=D0=BB=D1= =83=D1=87=D0=B0=D0=B5 =D0=BC=D0=BD=D0=B5 =D0=BD=D1=83=D0=B6=D0=BD=D0=BE =D1= =81=D0=B4=D0=B5=D0=BB=D0=B0=D1=82=D1=8C? =D1=83=D0=B4=D0=B0=D0=BB=D0=B8=D1= =82=D1=8C =D1=81=D0=B2=D0=BE=D0=B9 refs/heads/dbmail_2_2=20 > (=D0=BA=D0=B0=D0=BA?) =D0=B8 =D1=81=D0=B8=D0=BD=D1=85=D1=80=D0=BE=D0=BD= =D0=B8=D0=B7=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=D1=81=D1=8F =D0=B7= =D0=B0=D0=BD=D0=BE=D0=B2=D0=BE? # =D1=83=D0=B4=D0=B0=D0=BB=D0=B8=D1=82=D1=8C git branch -D dbmail_2_2 # =D0=B0 =D0=B4=D0=B0=D0=BB=D1=8C=D1=88=D0=B5 =D0=BB=D1=83=D1=87=D1=88=D0= =B5 =D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D1=82=D1=8C remote git add -f upstream http://... # =D1=81=D0=BC=D0=BE=D1=82=D1=80=D0=B8=D0=BC =D0=BA=D0=B0=D0=BA=D0=B8=D0=B5= =D0=B1=D1=80=D0=B0=D0=BD=D1=87=D0=B8 =D0=B7=D0=B0=D0=B1=D1=80=D0=B0=D0=BB= =D0=B8 git branch -a # =D1=87=D0=B5=D0=BA=D0=B0=D1=83=D1=82=D0=B8=D0=BC =D0=B8=D0=B7 =D1=82=D0= =BE=D0=B3=D0=BE =D1=87=D1=82=D0=BE =D0=B7=D0=B0=D0=B1=D1=80=D0=B0=D0=BB=D0= =B8 =D0=B2 =D0=BB=D0=BE=D0=BA=D0=B0=D0=BB=D1=8C=D0=BD=D1=8B=D0=B9 =D0=B1=D1= =80=D0=B0=D0=BD=D1=87 git checkout -b local_branch_name upstream/remote_branch_name # =D0=B8=D0=BB=D0=B8 =D0=BF=D1=83=D0=BB=D0=B8=D0=BC git pull . upstream/remote_branch_name:local_branch_name # =D0=BA=D0=BE=D0=B3=D0=B4=D0=B0 =D0=BD=D0=B0=D0=B4=D0=BE =D0=BE=D0=B1=D0= =BD=D0=BE=D0=B2=D0=BB=D1=8F=D0=B5=D0=BC =D0=BD=D1=83=D0=B6=D0=BD=D0=BE git fetch upstream =D0=BD=D1=83 =D0=B8 =D1=82.=D0=B4 P.S. =D0=BF=D0=B8=D1=81=D0=B0=D0=BB =D0=BD=D0=B5=D1=81=D0=BF=D0=B0=D0=B2=D1= =88=D0=B8 =D0=BF=D0=BE =D0=BF=D0=B0=D0=BC=D1=8F=D1=82=D0=B8. =D0=BC=D0=BE= =D0=B3 =D0=BD=D0=B0=D0=BF=D1=83=D1=82=D0=B0=D1=82=D1=8C =D1=87=D0=B5=D0=B3= =D0=BE. --=20 Regards, Kirill A. Shutemov + Belarus, Minsk + Velesys LLC, http://www.velesys.com/ + ALT Linux Team, http://www.altlinux.com/ --AqsLC8rIMeq19msA 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) iD8DBQFGamA7bWYnhzC5v6oRAmn0AJkB768SW8sdSQan3dd/9Px4krz0WgCeO2OI H/fgXdEb3i96wufbFNgpeZI= =crYz -----END PGP SIGNATURE----- --AqsLC8rIMeq19msA--