From: "Marco Costalba" <mcostalba@gmail.com>
To: "Steffen Prohaska" <prohaska@zib.de>
Cc: "Git Mailing List" <git@vger.kernel.org>
Subject: Re: limiting rename detection during merge is a really bad idea
Date: Mon, 11 Feb 2008 08:42:06 +0100 [thread overview]
Message-ID: <e5bfff550802102342r4b4d4c83mb3c9871d0206b2fa@mail.gmail.com> (raw)
In-Reply-To: <CF28A4AE-62F0-4E41-9794-2CF85C2C7855@zib.de>
On Feb 11, 2008 7:19 AM, Steffen Prohaska <prohaska@zib.de> wrote:
>
>
> It doesn't make sense not to detect
> renames during a merge.
>
> Opinions?
>
I agree 100%, merge is a very important and sensible task and git
should push as much as possible to avoid fails.
A failed merge is always an hassle for the developer also in simple
cases and when a successful merge is possible git should really try to
achieve that also if it takes a little time more.
So I second overriding diff.renamelimit in this case.
Marco
next prev parent reply other threads:[~2008-02-11 7:42 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-11 6:19 limiting rename detection during merge is a really bad idea Steffen Prohaska
2008-02-11 7:42 ` Marco Costalba [this message]
2008-02-11 7:48 ` Jeff King
2008-02-11 7:55 ` Marco Costalba
2008-02-11 8:03 ` Jeff King
2008-02-11 10:41 ` Lars Hjemli
2008-02-11 11:08 ` Jeff King
2008-02-11 11:20 ` Santi Béjar
2008-02-11 11:40 ` Jeff King
2008-02-11 13:29 ` Steffen Prohaska
2008-02-11 11:35 ` Jeff King
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=e5bfff550802102342r4b4d4c83mb3c9871d0206b2fa@mail.gmail.com \
--to=mcostalba@gmail.com \
--cc=git@vger.kernel.org \
--cc=prohaska@zib.de \
/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).