From: Eric Sunshine <sunshine@sunshineco.com>
To: "Felipe Gonçalves Assis" <felipeg.assis@gmail.com>
Cc: "Git List" <git@vger.kernel.org>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"Junio C Hamano" <gitster@pobox.com>,
"Felipe Gonçalves Assis" <felipegassis@gmail.com>
Subject: Re: [PATCH v3 1/2] merge-recursive: option to disable renames
Date: Tue, 16 Feb 2016 20:41:25 -0500 [thread overview]
Message-ID: <CAPig+cRCKQ8Vpr11XB-MSNsjDXjMHstaEAz333nMZxuKC8xmEg@mail.gmail.com> (raw)
In-Reply-To: <1455671495-10908-2-git-send-email-felipegassis@gmail.com>
On Tue, Feb 16, 2016 at 8:11 PM, Felipe Gonçalves Assis
<felipeg.assis@gmail.com> wrote:
> The recursive strategy turns on rename detection by default. Add a
> strategy option to disable rename detection even for exact renames.
>
> Signed-off-by: Felipe Gonçalves Assis <felipegassis@gmail.com>
> ---
> diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt
> @@ -81,8 +81,14 @@ no-renormalize;;
> +no-renames;;
> + Turn off rename detection.
> + See also linkgit:git-diff[1] `--no-renames`.
> +
> rename-threshold=<n>;;
> Controls the similarity threshold used for rename detection.
> + Re-enables rename detection if disabled by a preceding
> + `no-renames`.
I'm not sure that it is necessary to mention the "last one wins" rule
here, but if you do so, does --no-renames documentation deserve
similar treatment?
> See also linkgit:git-diff[1] `-M`.
next prev parent reply other threads:[~2016-02-17 1:41 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-17 1:11 [PATCH v3 0/2] merge-recursive: option to disable renames Felipe Gonçalves Assis
2016-02-17 1:11 ` [PATCH v3 1/2] " Felipe Gonçalves Assis
2016-02-17 1:41 ` Eric Sunshine [this message]
2016-02-17 3:16 ` Felipe Gonçalves Assis
2016-02-17 1:11 ` [PATCH v3 2/2] merge-recursive: more consistent interface Felipe Gonçalves Assis
2016-02-17 1:52 ` Eric Sunshine
2016-02-17 1:37 ` [PATCH v3 0/2] merge-recursive: option to disable renames Eric Sunshine
2016-02-17 3:38 ` Felipe Gonçalves Assis
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=CAPig+cRCKQ8Vpr11XB-MSNsjDXjMHstaEAz333nMZxuKC8xmEg@mail.gmail.com \
--to=sunshine@sunshineco.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=felipeg.assis@gmail.com \
--cc=felipegassis@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).