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

Re: Better handling of local changes in 'gitk'?

From
Paul Mackerras <paulus@samba.org>
Date
Jul 13, 2007, 10:09 UTC
Message-ID
<18071.20289.270560.640460@cargo.ozlabs.ibm.com>
In-Reply-To
<18071.19489.6733.665052@cargo.ozlabs.ibm.com>
I wrote:
Show 7 quoted lines
> Try this, let me know what you think.  I called the changes in the
> working directory "Local uncommitted changes, not checked in to index"
> and the changes in the index "Local changes checked in to index but
> not committed".  If you prefer some other wording, let me know.  I
> made the working directory commit red (as before) and the index commit
> magenta, as being between red and blue.  The index commit gets a fake
> SHA1 id of 00..001.

I should add that I'm sure that gitk won't yet do the right thing if there are files in the index at other than stage 0, or if the local changes are the result of an incomplete merge. (In the latter case I suppose one or other of the fake commits should have multiple parents, but I don't have the infrastructure to add fake commits with multiple parents yet.)

Paul.
Previous: Paul MackerrasNext: Linus Torvalds
Message 6 of 9 in “Better handling of local changes in 'gitk'?”
  1. Linus TorvaldsJul 12, 2007
  2. Junio C HamanoJul 12, 2007
  3. Junio C HamanoJul 12, 2007
  4. Linus TorvaldsJul 12, 2007
  5. Paul MackerrasJul 13, 2007
  6. Paul MackerrasJul 13, 2007
  7. Linus TorvaldsJul 13, 2007
  8. Johannes SixtJul 13, 2007
  9. Linus TorvaldsJul 13, 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.