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

Re: non-empty index with git commit -a

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 16, 2011, 21:46 UTC
Message-ID
<7v39nnirfq.fsf@alter.siamese.dyndns.org>
In-Reply-To
<201102162203.40480.jnareb@gmail.com>
Jakub Narebski <jnareb@gmail.com> writes:
>> So I think we are really on the same page. :)
>
> Also it would be not as easy as reflogs - you would have either to save
> copy of index, or create a tree out of it and save reference in reflog.

Also note that "Create a tree out of it" is not always a useful way to save the state of the index. The "stash" shares the same issue, but you would need an equivalent of a tarball that consists of the index file (with conflicted state) and the files in the working tree that corresponds to index entries with conflicted states if you want to be useful for storing a state away in case you botch the conflict resolution you are attempting.

Previous: Jakub NarebskiNext: Jeff King
Message 20 of 25 in “non-empty index with git commit -a”
  1. Sverre RabbelierFeb 15, 2011
  2. Jeff KingFeb 16, 2011
  3. Jonathan NiederFeb 16, 2011
  4. Jeff KingFeb 16, 2011
  5. Sverre RabbelierFeb 16, 2011
  6. Nguyen Thai Ngoc DuyFeb 16, 2011
  7. Jonathan NiederFeb 16, 2011
  8. Jeff KingFeb 16, 2011
  9. Sverre RabbelierFeb 16, 2011
  10. Jeff KingFeb 16, 2011
  11. Sverre RabbelierFeb 16, 2011
  12. Jeff KingFeb 16, 2011
  13. Michael J GruberFeb 16, 2011
  14. Jeff KingFeb 16, 2011
  15. Junio C HamanoFeb 16, 2011
  16. Jeff KingFeb 16, 2011
  17. Junio C HamanoFeb 16, 2011
  18. Jeff KingFeb 16, 2011
  19. Jakub NarebskiFeb 16, 2011
  20. Junio C HamanoFeb 16, 2011
  21. Jeff KingFeb 16, 2011
  22. Matthieu MoyFeb 16, 2011
  23. Jeff KingFeb 16, 2011
  24. Junio C HamanoFeb 16, 2011
  25. Matthieu MoyFeb 16, 2011

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.