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

Re: How to selectively recreate merge state?

From
Junio C Hamano <gitster@pobox.com>
Date
Dec 11, 2009, 01:11 UTC
Message-ID
<7vzl5q71rp.fsf@alter.siamese.dyndns.org>
In-Reply-To
<m38wdae4k4.fsf@localhost.localdomain>
Jakub Narebski <jnareb@gmail.com> writes:
Show 6 quoted lines
>   --unresolve::
>         Restores the 'unmerged' or 'needs updating' state of a
>         file during a merge if it was cleared by accident.
>
> Unless "git add foo" not only adds current contents of foo at stage 0,
> but also removes higher stages from index...
By definition, adding anything at stage #0 is to remove higher stages.
Previous: Jakub NarebskiNext: Jakub Narebski
Message 4 of 18 in “How to selectively recreate merge state?”
  1. Jay SoffianDec 10, 2009
  2. Junio C HamanoDec 11, 2009
  3. Jakub NarebskiDec 11, 2009
  4. Junio C HamanoDec 11, 2009
  5. Jakub NarebskiDec 11, 2009
  6. Michael J GruberDec 11, 2009
  7. Björn SteinbrinkDec 11, 2009
  8. Thomas RastDec 11, 2009
  9. Jakub NarebskiDec 11, 2009
  10. Michael J GruberDec 11, 2009
  11. Jakub NarebskiDec 11, 2009
  12. Michael J GruberDec 11, 2009
  13. Junio C HamanoDec 11, 2009
  14. Junio C HamanoDec 11, 2009
  15. Jay SoffianDec 11, 2009
  16. Junio C HamanoDec 11, 2009
  17. Paolo BonziniDec 11, 2009
  18. Junio C HamanoDec 11, 2009

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.