Hence, a configuration variable which is able
to set specific algorithm is needed. For now, these four values are
accepted: 'myers' (which has the same effect as not setting the config
variable at all), 'minimal', 'patience' and 'histogram'.
Signed-off-
`. The older options
(`--minimal`, `--patience` and `--histogram`) are kept for
backward compatibility.
Signed-off-by: Michal Privoznik
---
Documentation/diff-options.txt | 22 ++
contrib/completion/git-completion.bash | 11 +++
diff.c
Even though --patience was already there, we missed --minimal and
--histogram for some reason.
Signed-off-by: Michal Privoznik
---
contrib/completion/git-completion.bash | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/completion/git-completion.bash
b/contrib
It's been a while I was trying to get this in. Recently, I realized how
important this is.
Please keep me CC'ed as I am not subscribed to the list.
Michal Privoznik (3):
git-completion.bash: Autocomplete --minimal and --histogram for
git-diff
config: Introduce diff.algorith
Even though --patience was already there, we missed --minimal and
--histogram for some reason.
Signed-off-by: Michal Privoznik
---
contrib/completion/git-completion.bash | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/completion/git-completion.bash
b/contrib
Hence, a configuration variable which is able
to set specific algorithm is needed. For now, these four values are
accepted: 'myers' (which has the same effect as not setting the config
variable at all), 'minimal', 'patience' and 'histogram'.
Signed-off-
`.
Signed-off-by: Michal Privoznik
---
Documentation/diff-options.txt | 23 +++
contrib/completion/git-completion.bash | 11 +++
diff.c | 12 +++-
diff.h | 2 ++
merge-recursive.c
It's been a while I was trying to get this in. Recently, I realized how
important this is.
Please keep me CC'ed as I am not subscribed to the list.
diff to v1:
-Junio's suggestions worked in
Michal Privoznik (3):
git-completion.bash: Autocomplete --minimal and --histogram f
On 14.01.2013 22:06, Junio C Hamano wrote:
> Michal Privoznik writes:
>
>> +--diff-algorithm={patience|minimal|histogram|myers}::
>> +Choose a diff algorithm. The variants are as follows:
>> ++
>> +--
>> +`myers`;;
>> +The basic greedy diff algo
It's been a while I was trying to get this in. Recently, I realized how
important this is.
Please keep me CC'ed as I am not subscribed to the list.
diff to v1:
-Junio's suggestions worked in
diff to v2:
-yet more Junio's suggestions included
Michal Privoznik (3):
Even though --patience was already there, we missed --minimal and
--histogram for some reason.
Signed-off-by: Michal Privoznik
---
contrib/completion/git-completion.bash | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/completion/git-completion.bash
b/contrib
`.
Signed-off-by: Michal Privoznik
---
Documentation/diff-options.txt | 21 +
contrib/completion/git-completion.bash | 11 +++
diff.c | 12 +++-
diff.h | 2 ++
merge-recursive.c
Hence, a configuration variable which is able
to set specific algorithm is needed. For now, these four values are
accepted: 'myers' (which has the same effect as not setting the config
variable at all), 'minimal', 'patience' and 'histogram'.
Signed-off-
13 matches
Mail list logo