On Sat, Apr 10, 2010 at 11:00:42AM +0200, Björn Steinbrink wrote: > > I think most people do something like: > > > > gitk HEAD^..ORIG_HEAD > > > > To see everything in ORIG_HEAD that isn't in HEAD^ (the first parent of > > HEAD, or what you had just before the pull). > > I guess you meant to say "gitk ORIG_HEAD.." there. ORIG_HEAD is already > the pre-pull state. So if the merge actually created a merge commit, > then HEAD^ == ORIG_HEAD, and if it was a fast-forward, then ORIG_HEAD is > either the same as HEAD^ or one of its ancestors. In either case, > HEAD^..ORIG_HEAD will be empty. Urgh, yes. Sorry, I was totally not thinking when I wrote that. I never use ORIG_HEAD, as I always do a fetch + inspect + merge, rather than pull. But I can't even figure out what thought process led me to write what I did above. Thanks for the correction. -Peff -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html