Thread (6 messages) 6 messages, 5 authors, 2016-06-15

Re: [PATCH] config: Introduce --patience config variable

flat view

From: Michal Privoznik <hidden>
Date: 2016-06-15 22:53:13

Possibly related (same subject, not in this thread)

On 06.03.2012 14:01, Thomas Rast wrote:
Jeff King [off-list ref] writes:
quoted
On Tue, Mar 06, 2012 at 11:59:42AM +0100, Michal Privoznik wrote:
quoted
--- 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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help