git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: git pull versus fetch/merge

From
Jeff King <peff@peff.net>
Date
Jul 21, 2008, 11:09 UTC
Message-ID
<20080721110900.GA8550@sigill.intra.peff.net>
In-Reply-To
<48846BC2.4090407@keyaccess.nl>
On Mon, Jul 21, 2008 at 12:58:10PM +0200, Rene Herman wrote:
Show 5 quoted lines
> 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
Previous: Rene HermanNext: Jeff King
Message 4 of 8 in “git pull versus fetch/merge”
  1. Rene HermanJul 21, 2008
  2. Björn SteinbrinkJul 21, 2008
  3. Rene HermanJul 21, 2008
  4. Jeff KingJul 21, 2008
  5. Jeff KingJul 21, 2008
  6. Rene HermanJul 21, 2008
  7. Björn SteinbrinkJul 21, 2008
  8. Rene HermanJul 21, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.