From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-ID: <466A66CB.4040707@stc.donpac.ru> Date: Sat, 09 Jun 2007 12:37:31 +0400 From: Eugene Prokopiev User-Agent: Mozilla/5.0 (X11; U; Linux i686; ru-RU; rv:1.7.2) Gecko/20040808 X-Accept-Language: ru-ru, ru MIME-Version: 1.0 To: ALT Devel discussion list References: <466A3708.3060806@stc.donpac.ru> <20070609072440.GA3142@localhost.localdomain> <466A5DA2.9030208@stc.donpac.ru> <20070609080908.GA22294@localhost.localdomain> In-Reply-To: <20070609080908.GA22294@localhost.localdomain> Content-Type: text/plain; charset=KOI8-R; format=flowed X-DSPAM-Result: Whitelisted X-DSPAM-Processed: Sat Jun 9 12:41:42 2007 X-DSPAM-Confidence: 0.9899 X-DSPAM-Probability: 0.0000 X-DSPAM-Signature: 119,466a67c6268612625160636 X-DSPAM-Factors: 27, Received*Postfix+with, 0.01000, С, 0.01000, Date*12, 0.01000, Content-Type*text+plain, 0.01000, User-Agent*ru-RU+rv, 0.01000, Received*ESMTP, 0.01000, Received*12, 0.01000, Content-Transfer-Encoding*8bit, 0.01000, dbmail, 0.01000, dbmail, 0.01000, To*Devel, 0.01000, User-Agent*X11+U, 0.01000, бранче, 0.01000, образом, 0.01000, делать, 0.01000, fetch, 0.01000, что, 0.01000, что, 0.01000, User-Agent*U, 0.01000, Евгений, 0.01000, Это, 0.01000, Content-Type*plain, 0.01000, Received*devel, 0.01000, Received*devel+lists.altlinux.org, 0.01000, Eugene+Prokopiev, 0.01000, References*stc.donpac.ru, 0.01000, References*stc.donpac.ru, 0.01000 Content-Transfer-Encoding: quoted-printable 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:41:43 -0000 Archived-At: List-Archive: List-Post: Kirill A. Shutemov =D0=C9=DB=C5=D4: > On [Sat, 09.06.2007 11:58], Eugene Prokopiev wrote: >=20 >>>=FC=D4=CF =DA=CE=C1=DE=C9=D4, =DE=D4=CF =D7=C1=DB refs/heads/dbmail_2_= 2 =CE=C5 =D1=D7=CC=D1=C5=D4=D3=D1 =D0=D2=C5=C4=CB=CF=CD >>>refs/heads/dbmail_2_2. =F7=C5=D2=CF=D1=D4=CE=C5=CA =D7=D3=C5=C7=CF, =D7= =D9 =D7 =CE=C5=C7=CF =DE=C5=C7=CF-=CE=C9=D4=D8 =CB=CF=CD=C9=D4=C9=CC=C9 =D7 >>>=CE=C5=C7=CF =C9=CC=C9 upstream =C9=D3=D4=CF=D2=C9=C0 =CC=CF=CD=C1=CC(= =DE=D4=CF =CD=C5=CE=C5=C5 =D7=C5=D2=CF=D1=D4=CE=CF). git fetch =CE=C5 =CD= =C5=D2=D6=C9=D4, >>>=C1 =D4=CF=CC=CB=CF =DA=C1=C2=C9=D2=C1=C5=D4. >> >>=CD=CF=C9 =CB=CF=CD=CD=C9=D4=D9 =D7 =C4=D2=D5=C7=CF=CD =C2=D2=C1=CE=DE=C5= , =C1 =C1=D0=D3=D4=C9=CD =CC=CF=CD=C1=D4=D8, =D0=CF=C8=CF=D6=C5, =CD=CF=C7= :( >> >>=DE=D4=CF =D7 =D4=C1=CB=CF=CD =D3=CC=D5=DE=C1=C5 =CD=CE=C5 =CE=D5=D6=CE= =CF =D3=C4=C5=CC=C1=D4=D8? =D5=C4=C1=CC=C9=D4=D8 =D3=D7=CF=CA refs/heads/= dbmail_2_2=20 >>(=CB=C1=CB?) =C9 =D3=C9=CE=C8=D2=CF=CE=C9=DA=C9=D2=CF=D7=C1=D4=D8=D3=D1= =DA=C1=CE=CF=D7=CF? >=20 >=20 > # =D5=C4=C1=CC=C9=D4=D8 > git branch -D dbmail_2_2 >=20 > # =C1 =C4=C1=CC=D8=DB=C5 =CC=D5=DE=DB=C5 =C4=CF=C2=C1=D7=C9=D4=D8 remot= e > git add -f upstream http://... =D4=C1=CB=C9=CD =CF=C2=D2=C1=DA=CF=CD, =CB=C1=CB =D1 =D0=CF=CE=C9=CD=C1=C0= , =D1 =DA=C1=C2=C5=D2=D5 =D7=C5=D3=D8=20 http://nfg3.nfgs.net/git/dbmail.git, =C1 =DE=D4=CF =C4=C5=CC=C1=D4=D8 =C5= =D3=CC=C9 =CD=CE=C5 =CE=D5=D6=C5=CE =D4=CF=CC=D8=CB=CF=20 =C2=D2=C1=CE=DE dbmail_2_2? --=20 =F3 =D5=D7=C1=D6=C5=CE=C9=C5=CD, =F0=D2=CF=CB=CF=D0=D8=C5=D7 =E5=D7=C7=C5= =CE=C9=CA