Re: git pull versus fetch/merge

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Mon, Jul 21, 2008 at 12:58:10PM +0200, Rene Herman wrote:

> Thank you. Also due to a reply on the ALSA list by Mark brown I now get  
> this. Yes, the remote was rebased while I had it setup as a remote here  
> it seems; only recently have it under this name, so I didn't think that  
> was the case. After a "git remote rm tiwai, git remote add tiwai <url>"  
> things work fine again as it fetched a completely new branch.

Not that adding the remote with "git remote add" will add a fetchspec
line like this:

[remote "tiwai"]
  fetch = +refs/heads/*:+refs/remotes/tiwai/*

where the '+' means to force fetching rewound branches instead of
rejecting them (this is safe, since you are just overwriting tracking
branches, not your local work). So this should not come up again;
presumably your previous remote configuration was set up differently.

-Peff
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux