From: Michal Privoznik <mprivozn@redhat.com>
To: Thomas Rast <trast@inf.ethz.ch>
Cc: Jeff King <peff@peff.net>, git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH] config: Introduce --patience config variable
Date: Tue, 06 Mar 2012 14:32:33 +0100 [thread overview]
Message-ID: <4F5611F1.4020309@redhat.com> (raw)
In-Reply-To: <87pqcp6fyh.fsf@thomas.inf.ethz.ch>
On 06.03.2012 14:01, Thomas Rast wrote:
> Jeff King <peff@peff.net> writes:
>
>> On Tue, Mar 06, 2012 at 11:59:42AM +0100, Michal Privoznik wrote:
>>
>>> --- a/Documentation/diff-config.txt
>>> +++ b/Documentation/diff-config.txt
>>> @@ -86,6 +86,9 @@ diff.mnemonicprefix::
>>> diff.noprefix::
>>> If set, 'git diff' does not show any source or destination prefix.
>>>
>>> +diff.patience:
>>> + If set, 'git diff' will use patience algorithm.
>>> +
>>
>> Should this be a boolean? Or should we actually have a diff.algorithm
>> option where you specify the algorithm you want (e.g., "diff.algorithm =
>> patience")? That would free us up later to more easily add new values.
>>
>> In particular, I am thinking about --minimal. It is mutually exclusive
>> with --patience, and is simply ignored if you use patience diff.
>> we perhaps have "diff.algorithm" which can be one of "myers", "minimal"
>> (which is really myers + the minimal flag), and "patience".
>
> Don't forget "histogram". I have no idea why it's not documented
> (evidently 8c912eea slipped through the review cracks) but --histogram
> is supported since 1.7.7.
>
Okay guys. I'll got with diff.algorithm = [patience | minimal |
histogram | myers] then. What I am not sure about is how to threat case
when user have say algorithm = patience set in config but want to use
myers. I guess we need --myers option then, don't we?
Michal
next prev parent reply other threads:[~2012-03-06 13:33 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-06 10:59 [PATCH] config: Introduce --patience config variable Michal Privoznik
2012-03-06 11:49 ` Jeff King
2012-03-06 13:01 ` Thomas Rast
2012-03-06 13:15 ` [PATCH 1/2] perf: compare diff algorithms Thomas Rast
2012-03-06 13:15 ` [PATCH 2/2] Document the --histogram diff option Thomas Rast
2012-03-06 19:57 ` Junio C Hamano
2012-03-06 20:42 ` Thomas Rast
2012-03-06 19:52 ` [PATCH 1/2] perf: compare diff algorithms Junio C Hamano
2012-03-06 21:00 ` Thomas Rast
2012-03-06 21:18 ` Junio C Hamano
2012-03-06 21:41 ` Jakub Narebski
2012-03-07 12:44 ` Thomas Rast
2012-03-07 17:45 ` Junio C Hamano
2012-03-07 18:03 ` Jakub Narebski
2012-03-07 18:19 ` Junio C Hamano
2012-03-10 7:13 ` René Scharfe
2012-03-06 13:30 ` [PATCH] config: Introduce --patience config variable Jeff King
2012-03-06 13:32 ` Michal Privoznik [this message]
2012-03-06 13:38 ` Matthieu Moy
2012-03-06 14:09 ` Jeff King
2012-03-07 2:57 ` Junio C Hamano
2012-03-07 11:47 ` Jeff King
2012-03-07 17:24 ` 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=4F5611F1.4020309@redhat.com \
--to=mprivozn@redhat.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=trast@inf.ethz.ch \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.