On Wed, Jul 30, 2008 at 04:48:54AM +0200, Roman Zippel wrote: > Now compare the output of "git-log file1", "git-log --full-history file1" > and "git-log --full-history --parents file1". You get either both merge > commits or none, but only one of it is relevant to file1. Ah, I see. So if I understand you, you wanted to see something like: A--B \ \ C--D where A = initial commit B = duplicate change 1 C = duplicate change 2 D = merge branch 'test2' into HEAD where the simplification isn't as aggressive (you still see the duplicate commits and the merge), but we can get rid of the later merge between A and D because A is already an ancestor of D. So do you have a proposed set of simplification rules that will produce that output? -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
