From: Johannes Sixt <j.sixt@viscovery.net>
To: John Szakmeister <john@szakmeister.net>
Cc: Tomas Carnecky <tomas.carnecky@gmail.com>, git@vger.kernel.org
Subject: Re: Rename edge case...
Date: Fri, 09 Nov 2012 14:17:06 +0100 [thread overview]
Message-ID: <509D0252.8070901@viscovery.net> (raw)
In-Reply-To: <CAEBDL5WeQEWdyaJuuNbnnQbbsLYv8NO1ZSj3eHHpjW+ToS9X1A@mail.gmail.com>
Am 11/9/2012 11:25, schrieb John Szakmeister:
> On Fri, Nov 9, 2012 at 4:27 AM, Tomas Carnecky <tomas.carnecky@gmail.com> wrote:
> [snip]
>> When merging two branches, git only looks at the tips. It doesn't inspect
>> their histories to see how the files were moved around. So i doesn't matter
>> whether you rename the files in a single commit or multiple commits. The
>> resulting tree is always the same.
>
> I guess I figured that when I saw the final result, but didn't know if
> there was a way to coax Git into doing a better job here.
If the renames are split in two commits, you can merge the first, and then
the second on top of the result.
-- Hannes
next prev parent reply other threads:[~2012-11-09 13:17 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-09 9:10 Rename edge case John Szakmeister
2012-11-09 9:27 ` Tomas Carnecky
2012-11-09 10:25 ` John Szakmeister
2012-11-09 10:30 ` Nguyen Thai Ngoc Duy
2012-11-09 13:17 ` Johannes Sixt [this message]
2012-11-09 16:09 ` Jeff King
2012-11-10 2:01 ` John Szakmeister
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=509D0252.8070901@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=git@vger.kernel.org \
--cc=john@szakmeister.net \
--cc=tomas.carnecky@gmail.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.