Re: can I get only the list of merges?

From: Linus Torvalds <torvalds@osdl.org>
Date: Jul 10, 2006, 18:51 UTC
Message-ID: <Pine.LNX.4.64.0607101145590.5623@g5.osdl.org>
In-Reply-To: <Pine.LNX.4.64.0607101103160.5623@g5.osdl.org>

On Mon, 10 Jul 2006, Linus Torvalds wrote:

Show 10 quoted lines

>
> However, if you want a _sneaky_ way of doing it, and want a graphical 
> result, and have a recent version of git, you can also just do something 
> like
> 
> 	gitk --full-history -- %%nonexistant-file%%
> 
> which will give you each commit that changes that nonexistant file (there 
> should be none ;), and the full commit history for those (ie all the 
> merges).

Btw, a better way to do the same is probably

	gitk --full-history -- a//b

which is guaranteed to not match any files and doesn't depend on just an _unlikely_ filename. Instead, it depends on the fact that a name with a double slash should not exist in a git archive.

(There are other possibilities too - instead of "a//a", you can just use the filename ".git", for the same reasons - it definitely won't be tracked by git).

		Linus