Linus Torvalds wrote: > [ For the non-git users, "git log --merge" is just shorthand for a much > more complicated git revision parsing expression which boils down to: > "show all commits as they pertain to any remaining unmerged pathnames, > and only within the symmetrical set difference between the two branches > you merged". You could write it out as > > git log ORIG_HEAD...MERGE_HEAD -- $(git ls-files --unmerged) > > but that "git log --merge" is a much simpler shorthand for that thing. > > It's not that merge conflicts are necessarily common, but when they do > happen, that's where you _really_ want the SCM to support you in > figuring out what happened ] It would be nice if this was documented in git-log(1), and not only _partially_ in git-rev-list(1). And it would be nice to have this in the proposed "Branches and merges" tutorial (part 3?) as well. -- Jakub Narebski Warsaw, Poland ShadeHawk on #git - 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