diff options
| author | Michal Privoznik <mprivozn@redhat.com> | 2013-01-16 07:51:58 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-16 17:41:18 (GMT) |
| commit | 07924d4d50e5304fb53eb60aaba8aef31d4c4e5e (patch) | |
| tree | 10760d4a006cead5202c480677f94ffac652f667 /Documentation/merge-strategies.txt | |
| parent | 07ab4dec80f1c24660ed4bc371849fb4f11a4ee3 (diff) | |
| download | git-07924d4d50e5304fb53eb60aaba8aef31d4c4e5e.zip git-07924d4d50e5304fb53eb60aaba8aef31d4c4e5e.tar.gz git-07924d4d50e5304fb53eb60aaba8aef31d4c4e5e.tar.bz2 | |
diff: Introduce --diff-algorithm command line option
Since command line options have higher priority than config file
variables and taking previous commit into account, we need a way
how to specify myers algorithm on command line. However,
inventing `--myers` is not the right answer. We need far more
general option, and that is `--diff-algorithm`.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions