From: Junio C Hamano <gitster@pobox•com>
To: Matthieu Moy <Matthieu.Moy@imag•fr>
Cc: git@vger•kernel.org
Subject: Re: [PATCH v2.1] Documentation/diff-config: fix description of diff.renames
Date: Thu, 25 Feb 2016 10:18:39 -0800 [thread overview]
Message-ID: <xmqqoab4odq8.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <1456421878-443-1-git-send-email-Matthieu.Moy@imag.fr> (Matthieu Moy's message of "Thu, 25 Feb 2016 18:37:58 +0100")
Matthieu Moy <Matthieu.Moy@imag•fr> writes:
> The description was misleading, since "set to any boolean value" include
> "set to false", and diff.renames=false does not enable basic detection,
> but actually disables it. Also, document that diff.renames only affects
> Porcelain.
>
> Signed-off-by: Matthieu Moy <Matthieu.Moy@imag•fr>
> ---
> Oops, trivial fix for typo noticed by Felipe. I'm resending just this
> one in case Junio wants to pick the latest version but I can obviously
> resend the whole if needed.
Heh, I guess people independently spotted the same typo nearly
simultaneously ;-)
I think I got this fixed locally (and adjusted the last one to
match). Thanks.
>
> Documentation/diff-config.txt | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt
> index 6eaa452..b5e9bda 100644
> --- a/Documentation/diff-config.txt
> +++ b/Documentation/diff-config.txt
> @@ -108,9 +108,13 @@ diff.renameLimit::
> detection; equivalent to the 'git diff' option '-l'.
>
> diff.renames::
> - Tells Git to detect renames. If set to any boolean value, it
> - will enable basic rename detection. If set to "copies" or
> - "copy", it will detect copies, as well.
> + Whether and how Git detects renames. If set to "false",
> + rename detection is disabled. If set to "true", basic rename
> + detection is enabled. If set to "copies" or "copy", Git will
> + detect copies, as well. Defaults to false. Note that this
> + affects only 'git diff' Porcelain like linkgit:git-diff[1] and
> + linkgit:git-log[1], and not lower level commands such as
> + linkgit:git-diff-files[1].
>
> diff.suppressBlankEmpty::
> A boolean to inhibit the standard behavior of printing a space
next prev parent reply other threads:[~2016-02-25 18:18 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-23 17:44 [PATCH 0/5] activate diff.renames by default Matthieu Moy
2016-02-23 17:44 ` [PATCH 1/5] Documentation/diff-config: fix description of diff.renames Matthieu Moy
2016-02-24 10:27 ` Jeff King
2016-02-25 17:27 ` Felipe Gonçalves Assis
2016-02-25 17:34 ` Matthieu Moy
2016-02-23 17:44 ` [PATCH 2/5] t4001-diff-rename: wrap file creations in a test Matthieu Moy
2016-02-24 10:25 ` Jeff King
2016-02-24 13:16 ` Matthieu Moy
2016-02-23 17:44 ` [PATCH 3/5] t: add tests for diff.renames (true/false/unset) Matthieu Moy
2016-02-23 17:44 ` [PATCH 4/5] log: introduce init_log_defaults() Matthieu Moy
2016-02-23 17:44 ` [PATCH 5/5] diff: activate diff.renames by default Matthieu Moy
2016-02-23 21:01 ` Junio C Hamano
2016-02-23 21:11 ` Matthieu Moy
2016-02-24 10:42 ` Jeff King
2016-02-25 8:54 ` Matthieu Moy
2016-02-23 19:17 ` [PATCH 0/5] " Junio C Hamano
2016-02-23 20:46 ` Matthieu Moy
2016-02-23 21:40 ` Junio C Hamano
2016-02-25 8:59 ` [PATCH v2 " Matthieu Moy
2016-02-25 8:59 ` [PATCH v2 1/5] Documentation/diff-config: fix description of diff.renames Matthieu Moy
2016-02-25 17:37 ` [PATCH v2.1] " Matthieu Moy
2016-02-25 18:18 ` Junio C Hamano [this message]
2016-02-25 17:53 ` [PATCH v2 1/5] " Junio C Hamano
2016-02-25 8:59 ` [PATCH v2 2/5] t4001-diff-rename: wrap file creations in a test Matthieu Moy
2016-02-25 8:59 ` [PATCH v2 3/5] t: add tests for diff.renames (true/false/unset) Matthieu Moy
2016-02-25 8:59 ` [PATCH v2 4/5] log: introduce init_log_defaults() Matthieu Moy
2016-02-25 19:31 ` Junio C Hamano
2016-02-25 8:59 ` [PATCH v2 5/5] diff: activate diff.renames by default Matthieu Moy
2016-02-25 17:52 ` 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=xmqqoab4odq8.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=Matthieu.Moy@imag$(echo .)fr \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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