Re: Finding all commits which modify a file
- From
Linus Torvalds <torvalds@linux-foundation.org>
- Date
- Jan 24, 2012, 01:15 UTC
- Message-ID
- <CA+55aFynLN7kBYh7i-kh+Xd1Qn-wKBePcokmJRNfe8RYA0cCZA@mail.gmail.com>
- In-Reply-To
- <CA+gHt1DxY42W9g+gJQTFrXuXBN-Jny+Jg60gKssdftZ5wxu91A@mail.gmail.com>
On Mon, Jan 23, 2012 at 4:58 PM, Santi Béjar <santi@agolina.net> wrote:
Show 10 quoted lines
> > 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.
Linus