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

Re: How to merge FETCH_HEAD?

From
Junio C Hamano <junkio@cox.net>
Date
Jan 17, 2007, 06:14 UTC
Message-ID
<7vk5zmtc1n.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<20070117050955.GC4329@mellanox.co.il>
"Michael S. Tsirkin" <mst@mellanox.co.il> writes:
Show 5 quoted lines
>> No. FETCH_HEAD is local. And for local merges, you should use git-merge, 
>> not git-pull.
>
> But, that can not take FETCH_HEAD either.
> Would it be useful for git-merge FETCH_HEAD to work?
Please try again, starting from the "git fetch".

I suspect the reason you think "merge FETCH_HEAD" does not work is because you lost FETCH_HEAD when you did "git pull . FETCH_HEAD", as I explained to you in an earlier message.

Previous: Michael S. TsirkinNext: Michael S. Tsirkin
Message 9 of 19 in “new config option remote.<name>.pushexec”
  1. new config option remote.<name>.pushexecUwe Kleine-König, Jan 16, 2007
  2. Johannes SchindelinJan 16, 2007
  3. Uwe Kleine-KönigJan 16, 2007
  4. How to merge FETCH_HEAD?Michael S. Tsirkin, Jan 16, 2007
  5. Shawn O. PearceJan 16, 2007
  6. Michael S. TsirkinJan 16, 2007
  7. Johannes SchindelinJan 16, 2007
  8. Michael S. TsirkinJan 17, 2007
  9. Junio C HamanoJan 17, 2007
  10. Michael S. TsirkinJan 17, 2007
  11. Junio C HamanoJan 16, 2007
  12. Shawn O. PearceJan 16, 2007
  13. Johannes SchindelinJan 16, 2007
  14. Uwe Kleine-KönigJan 17, 2007
  15. Junio C HamanoJan 17, 2007
  16. Uwe Kleine-KönigJan 18, 2007
  17. make --upload-pack option to git-fetch configurableUwe Kleine-König, Jan 25, 2007
  18. Uwe Kleine-KönigJan 25, 2007
  19. Brian GernhardtJan 16, 2007

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.