From: Santi Béjar Date: Tue, 24 Jan 2012 01:36:09 GMT Subject: Re: Finding all commits which modify a file Message-ID: In-Reply-To: On Tue, Jan 24, 2012 at 2:15 AM, Linus Torvalds wrote: > On Mon, Jan 23, 2012 at 4:58 PM, Santi Béjar wrote: >> >> If you add parent rewriting (--parent, --graph or see it in gitk, with >> --full-history) you'll get your B2 commit as it adds commits to have a >> meaningful history. But I don't think this is what you are asking for. >> >>  You could try the following patch (sorry for the whitespace damage, >> also attatched): >> >> Subject: [PATCH/RFC] revision: merging branches with different content >> is interesting in --full-history > > The concept seems sane. > > But please check the interaction with "--simplify-merges" too, just in > case. The merge simplification looks at TREESAME too, so I suspect > your change may break merge simplification. Indeed, there is a bad interaction with --simplify-merges. If you add --simplify-merges it not only increase the number of commit but changes them :-( $ ./git rev-list --full-history --simplify-merges HEAD Makefile > rev-list.simp-merges $ ./git rev-list --full-history HEAD Makefile > rev-list.new $ diff rev-list.new rev-list.simp-merges -u | diffstat rev-list.simp-merges | 1841 ++++++++++++++++++++++++++------------------------- 1 file changed, 944 insertions(+), 897 deletions(-) Santi