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

Re: friendlier names

From
Junio C Hamano <gitster@pobox.com>
Date
Jan 28, 2009, 04:51 UTC
Message-ID
<7vwscgvxrm.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<200901280312.16717.jnareb@gmail.com>
Jakub Narebski <jnareb@gmail.com> writes:
> BTW with "git add" way you have to know that "git add"-ing a file
> would clear 'is in merge conflict' flags (well, will hide >0 stages...).
Sigh...

Again, you seem to be affected by the same confusion that caused you to think "git resolved" may have some reason to exist.

An unmerged index with higer stages means that the contents that need to be in the next commit is _unknown_ for the paths.

If somebody says "I am telling you that this path has the contents I want to have in the commit I will create next" (which is what "staging" the contents in the "index" is), what plausible reason does git have to keep the higher stages for them? At that point, the contents the user wants to have for these paths are known.

Previous: Jakub Narebski
Message 10 of 10 in “friendlier names”
  1. David AbrahamsJan 27, 2009
  2. Felipe ContrerasJan 27, 2009
  3. Shawn O. PearceJan 27, 2009
  4. David AbrahamsJan 27, 2009
  5. Johannes SchindelinJan 27, 2009
  6. Junio C HamanoJan 27, 2009
  7. Jakub NarebskiJan 27, 2009
  8. Junio C HamanoJan 27, 2009
  9. Jakub NarebskiJan 28, 2009
  10. Junio C HamanoJan 28, 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.