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

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

From
Linus Torvalds <torvalds@linux-foundation.org>
Date
Jul 13, 2007, 19:32 UTC
Message-ID
<alpine.LFD.0.999.0707131231080.20061@woody.linux-foundation.org>
In-Reply-To
<18071.20289.270560.640460@cargo.ozlabs.ibm.com>
On Fri, 13 Jul 2007, Paul Mackerras wrote:
Show 7 quoted lines
> 
> 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.)

That would be beautiful to see, indeed, when you're in the middle of a merge. "gitk --merge" already does most of it, but actually seeing the diff of the currently merged stuff would be pretty darn cool.

		Linus
Previous: Paul MackerrasNext: Johannes Sixt
Message 7 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.