From: Jeff King <peff@peff.net>
To: Thomas Rast <trast@inf.ethz.ch>
Cc: Michal Privoznik <mprivozn@redhat.com>,
git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH] config: Introduce --patience config variable
Date: Tue, 6 Mar 2012 08:30:01 -0500 [thread overview]
Message-ID: <20120306133001.GA22153@sigill.intra.peff.net> (raw)
In-Reply-To: <87pqcp6fyh.fsf@thomas.inf.ethz.ch>
On Tue, Mar 06, 2012 at 02:01:42PM +0100, Thomas Rast 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.
Ah, thanks. I had the vague feeling that we had a third algorithm
already, but I didn't see it in the docs. So yeah, I really think this
should be diff.algorithm, with a value of "myers", "patience", or
"histogram" (and possibly "minimal", depending how we want to treat
that).
-Peff
next prev parent reply other threads:[~2012-03-06 13:30 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 ` Jeff King [this message]
2012-03-06 13:32 ` [PATCH] config: Introduce --patience config variable Michal Privoznik
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120306133001.GA22153@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mprivozn@redhat.com \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).