From: Jeff King <peff@peff.net>
To: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Cc: Michal Privoznik <mprivozn@redhat.com>,
Thomas Rast <trast@inf.ethz.ch>,
git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH] config: Introduce --patience config variable
Date: Tue, 6 Mar 2012 09:09:11 -0500 [thread overview]
Message-ID: <20120306140911.GA22329@sigill.intra.peff.net> (raw)
In-Reply-To: <vpqr4x5hmt3.fsf@bauges.imag.fr>
On Tue, Mar 06, 2012 at 02:38:16PM +0100, Matthieu Moy wrote:
> Michal Privoznik <mprivozn@redhat.com> writes:
>
> > 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?
>
> At this point, maybe it's time to have
> --diff-algorithm=[patience|minimal|histogram|myers], and keep
> --patience, --minimal and --histogram just as compatibility aliases.
>
> Having one option per algorithm feels wrong ...
Yeah, that was going to be my suggestion, too. And explaining it that
way in the docs will make it clear that "--histogram" overrides
"--patience" and so forth.
-Peff
next prev parent reply other threads:[~2012-03-06 14:09 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
2012-03-06 13:38 ` Matthieu Moy
2012-03-06 14:09 ` Jeff King [this message]
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=20120306140911.GA22329@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=Matthieu.Moy@grenoble-inp.fr \
--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).