Re: gitk patch collection pull request

From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Oct 19, 2007, 19:31 UTC
Message-ID: <alpine.LFD.0.999.0710191227340.26902@woody.linux-foundation.org>
In-Reply-To: <20071019052823.GI14735@spearce.org>

On Fri, 19 Oct 2007, Shawn O. Pearce wrote:

>
> The following changes since commit 719c2b9d926bf2be4879015e3620d27d32f007b6:
>   Paul Mackerras (1):
>         gitk: Fix bug causing undefined variable error when cherry-picking

The biggest problem I have with gitk is that it is almost totally useless for when you have a file limit.

I do "gitk --merge" (which has an implicit file limit of the list of unmerged files) or just "gitk ORIG_HEAD.. Makefile" and the *history* of gitk looks fine.

But the diffs are crap and useless, because they contain all the stuff I did *not* want, and hides all the relevant information.

So then I might use the nice gitk history window to see the commits, but I will fall back on "git log -p --merge" and "git log -p ORIG_HEAD.. Makefile" for the real work.

I had that happen unusually many times lately, since we had a fair number of (mostly trivial) conflicts during this merge window. And it's sad. Gitk is so good in so many other ways, and then it is so *totally* useless when it comes to something as fundamental as just looking at the history of a few files.

			Linus