[devel] git-fetch : not updating to non-fast forward branch

[Kirill A. Shutemov]

On [Sat, 09.06.2007 12:37], Eugene Prokopiev wrote:
> Kirill A. Shutemov п©п╦я┬п╣я┌:
> > On [Sat, 09.06.2007 11:58], Eugene Prokopiev wrote:
> > 
> >>>п╜я┌п╬ п╥п╫п╟я┤п╦я┌, я┤я┌п╬ п╡п╟я┬ refs/heads/dbmail_2_2 п╫п╣ я▐п╡п╩я▐п╣я┌я│я▐ п©я─п╣п╢п╨п╬п╪
> >>>refs/heads/dbmail_2_2. п▓п╣я─п╬я▐я┌п╫п╣п╧ п╡я│п╣пЁп╬, п╡я▀ п╡ п╫п╣пЁп╬ я┤п╣пЁп╬-п╫п╦я┌я▄ п╨п╬п╪п╦я┌п╦п╩п╦ п╡
> >>>п╫п╣пЁп╬ п╦п╩п╦ upstream п╦я│я┌п╬я─п╦я▌ п╩п╬п╪п╟п╩(я┤я┌п╬ п╪п╣п╫п╣п╣ п╡п╣я─п╬я▐я┌п╫п╬). git fetch п╫п╣ п╪п╣я─п╤п╦я┌,
> >>>п╟ я┌п╬п╩п╨п╬ п╥п╟п╠п╦я─п╟п╣я┌.
> >>
> >>п╪п╬п╦ п╨п╬п╪п╪п╦я┌я▀ п╡ п╢я─я┐пЁп╬п╪ п╠я─п╟п╫я┤п╣, п╟ п╟п©я│я┌п╦п╪ п╩п╬п╪п╟я┌я▄, п©п╬я┘п╬п╤п╣, п╪п╬пЁ :(
> >>
> >>я┤я┌п╬ п╡ я┌п╟п╨п╬п╪ я│п╩я┐я┤п╟п╣ п╪п╫п╣ п╫я┐п╤п╫п╬ я│п╢п╣п╩п╟я┌я▄? я┐п╢п╟п╩п╦я┌я▄ я│п╡п╬п╧ refs/heads/dbmail_2_2 
> >>(п╨п╟п╨?) п╦ я│п╦п╫я┘я─п╬п╫п╦п╥п╦я─п╬п╡п╟я┌я▄я│я▐ п╥п╟п╫п╬п╡п╬?
> > 
> > 
> > # я┐п╢п╟п╩п╦я┌я▄
> > git branch -D dbmail_2_2
> > 
> > # п╟ п╢п╟п╩я▄я┬п╣ п╩я┐я┤я┬п╣ п╢п╬п╠п╟п╡п╦я┌я▄ remote
> > git add -f upstream http://...
> 
> я┌п╟п╨п╦п╪ п╬п╠я─п╟п╥п╬п╪, п╨п╟п╨ я▐ п©п╬п╫п╦п╪п╟я▌, я▐ п╥п╟п╠п╣я─я┐ п╡п╣я│я▄ 
> http://nfg3.nfgs.net/git/dbmail.git, п╟ я┤я┌п╬ п╢п╣п╩п╟я┌я▄ п╣я│п╩п╦ п╪п╫п╣ п╫я┐п╤п╣п╫ я┌п╬п╩я▄п╨п╬ 
> п╠я─п╟п╫я┤ dbmail_2_2?

п║я┐п╢я▐ п©п╬ man'я┐
git add -f upstream -t dbmail_2_2 http://...

-- 
Regards,  Kirill A. Shutemov
 + Belarus, Minsk
 + Velesys LLC, http://www.velesys.com/
 + ALT Linux Team, http://www.altlinux.com/
----------- следущая часть -----------
п▒я▀п╩п╬ я┐п╢п╟п╩п╣п╫п╬ п╡п╩п╬п╤п╣п╫п╦п╣ п╫п╣ п╡ я┌п╣п╨я│я┌п╬п╡п╬п╪ я└п╬я─п╪п╟я┌п╣...
п≤п╪я▐     : п╬я┌я│я┐я┌я│я┌п╡я┐п╣я┌
п╒п╦п©     : application/pgp-signature
п═п╟п╥п╪п╣я─  : 189 п╠п╟п╧я┌п╬п╡
п·п©п╦я│п╟п╫п╦п╣: Digital signature
Url     : http://lists.altlinux.org/pipermail/devel/attachments/20070609/58783103/attachment.bin