From: Linus Torvalds <torvalds@linux-foundation.org>
To: "Santi Béjar" <santi@agolina.net>
Cc: Neal Groothuis <ngroot@lo-cal.org>,
Neal Kreitzinger <nkreitzinger@gmail.com>,
git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: Finding all commits which modify a file
Date: Mon, 23 Jan 2012 17:15:51 -0800 [thread overview]
Message-ID: <CA+55aFynLN7kBYh7i-kh+Xd1Qn-wKBePcokmJRNfe8RYA0cCZA@mail.gmail.com> (raw)
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:
>
> 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
next prev parent reply other threads:[~2012-01-24 1:16 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-20 21:35 Finding all commits which modify a file Neal Groothuis
2012-01-21 23:16 ` Neal Kreitzinger
2012-01-23 16:14 ` Neal Groothuis
2012-01-24 0:58 ` Santi Béjar
2012-01-24 1:15 ` Santi Béjar
2012-01-24 1:15 ` Linus Torvalds [this message]
2012-01-24 1:36 ` Santi Béjar
2012-01-24 18:35 ` Santi Béjar
2012-01-24 1:40 ` Junio C Hamano
2012-01-24 16:34 ` Neal Groothuis
2012-01-24 18:10 ` Santi Béjar
2012-01-25 16:23 ` Neal Groothuis
2012-01-26 22:42 ` Junio C Hamano
2012-01-22 4:03 ` Tay Ray Chuan
-- strict thread matches above, loose matches on Subject: below --
2012-02-02 14:55 Neal Groothuis
2012-02-02 19:13 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CA+55aFynLN7kBYh7i-kh+Xd1Qn-wKBePcokmJRNfe8RYA0cCZA@mail.gmail.com \
--to=torvalds@linux-foundation.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=ngroot@lo-cal.org \
--cc=nkreitzinger@gmail.com \
--cc=santi@agolina.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).