git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Eli Collins <eli@cloudera.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Mark Lodato <lodatom@gmail.com>, git@vger.kernel.org
Subject: Re: [PATCH] config.txt: fix placement of diff.noprefix
Date: Fri, 10 Sep 2010 09:46:44 -0700	[thread overview]
Message-ID: <AANLkTimpSPkA+=CHw2QqA17HkAdjB1Zd3tsGAWQ3-HiY@mail.gmail.com> (raw)
In-Reply-To: <7vvd6dh83o.fsf@alter.siamese.dyndns.org>

Good find. Apologies, looks like that was an issue with the original patch.

On Fri, Sep 10, 2010 at 9:32 AM, Junio C Hamano <gitster@pobox.com> wrote:
> Mark Lodato <lodatom@gmail.com> writes:
>
>> In git-config(1), diff.noprefix was placed in between
>> diff.mnemonicprefix and the list of mnemonic prefixes, which is
>> obviously incorrect and very confusing to readers.  Now, it is located
>> after the end of the explanation of mnemonicprefix, which makes much
>> more sense.
>>
>> Signed-off-by: Mark Lodato <lodatom@gmail.com>
>> ---
>>  Documentation/config.txt |    5 +++--
>>  1 files changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/Documentation/config.txt b/Documentation/config.txt
>> index d294dd6..d82c0da 100644
>> --- a/Documentation/config.txt
>> +++ b/Documentation/config.txt
>> @@ -813,8 +813,6 @@ diff.mnemonicprefix::
>>       standard "a/" and "b/" depending on what is being compared.  When
>>       this configuration is in effect, reverse diff output also swaps
>>       the order of the prefixes:
>> -diff.noprefix::
>> -     If set, 'git diff' does not show any source or destination prefix.
>>  `git diff`;;
>>       compares the (i)ndex and the (w)ork tree;
>>  `git diff HEAD`;;
>> @@ -826,6 +824,9 @@ diff.noprefix::
>>  `git diff --no-index a b`;;
>>       compares two non-git things (1) and (2).
>>
>> +diff.noprefix::
>> +     If set, 'git diff' does not show any source or destination prefix.
>> +
>>  diff.renameLimit::
>>       The number of files to consider when performing the copy/rename
>>       detection; equivalent to the 'git diff' option '-l'.
>
> Good eyes, thanks.  How did that happen I wonder...
>

      reply	other threads:[~2010-09-10 16:46 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-09-10  1:39 [PATCH] config.txt: fix placement of diff.noprefix Mark Lodato
2010-09-10 16:32 ` Junio C Hamano
2010-09-10 16:46   ` Eli Collins [this message]

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='AANLkTimpSPkA+=CHw2QqA17HkAdjB1Zd3tsGAWQ3-HiY@mail.gmail.com' \
    --to=eli@cloudera.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=lodatom@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).