From: Jeff King <peff@peff.net>
To: Jon Seymour <jon.seymour@gmail.com>
Cc: Anders Kaseorg <andersk@mit.edu>, git@vger.kernel.org
Subject: Re: Bugs with detection of renames that are also overwrites
Date: Tue, 23 Feb 2010 07:59:52 -0500 [thread overview]
Message-ID: <20100223125952.GA7638@coredump.intra.peff.net> (raw)
In-Reply-To: <2cfc40321002230453q3a593fa6l43850207ebddfc99@mail.gmail.com>
On Tue, Feb 23, 2010 at 11:53:13PM +1100, Jon Seymour wrote:
> I came across a similar case recently while testing my rebasing ideas
> which lead me to wonder - is there a way to suppress the rename and
> overwrite detection? For my purposes, I don't care if the diff is
> bulky, I just want it to apply reliably.
For diff generation, it should be off by default (but you may have
configured diff.renames, in which case you can pass --no-renames to
suppress it).
For the merge-recursive driver, it is on by default. You can hack it off
by setting merge.renamelimit to something small like '1' (but don't use
'0', which means "no limit"). Rebase uses "git am -3" internally, which
in turn invokes merge-recursive.
-Peff
next prev parent reply other threads:[~2010-02-23 12:59 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-13 23:46 Bugs with detection of renames that are also overwrites Anders Kaseorg
2010-02-23 12:22 ` Jeff King
2010-02-23 12:53 ` Jon Seymour
2010-02-23 12:59 ` Jeff King [this message]
2010-02-23 19:08 ` Anders Kaseorg
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=20100223125952.GA7638@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=andersk@mit.edu \
--cc=git@vger.kernel.org \
--cc=jon.seymour@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 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).