diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-02-17 16:19:03 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-17 16:19:03 -0800 |
| commit | 80ad00d04ac0573df6d945f3b7741ceadfdf7bb2 (patch) | |
| tree | ae9ba4515bab3b25d072dbfe5ab9595eda1c53a1 /diff-options.txt | |
| parent | 0292db3986d09450dc3666f193b5b5cdcd646f31 (diff) | |
| download | git-htmldocs-80ad00d04ac0573df6d945f3b7741ceadfdf7bb2.tar.gz | |
Autogenerated HTML docs for v1.8.2-rc0
Diffstat (limited to 'diff-options.txt')
| -rw-r--r-- | diff-options.txt | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/diff-options.txt b/diff-options.txt index 7a8747352..869d965a3 100644 --- a/diff-options.txt +++ b/diff-options.txt @@ -55,6 +55,26 @@ endif::git-format-patch[] --histogram:: Generate a diff using the "histogram diff" algorithm. +--diff-algorithm={patience|minimal|histogram|myers}:: + Choose a diff algorithm. The variants are as follows: ++ +-- +`default`, `myers`;; + The basic greedy diff algorithm. Currently, this is the default. +`minimal`;; + Spend extra time to make sure the smallest possible diff is + produced. +`patience`;; + Use "patience diff" algorithm when generating patches. +`histogram`;; + This algorithm extends the patience algorithm to "support + low-occurrence common elements". +-- ++ +For instance, if you configured diff.algorithm variable to a +non-default value and want to use the default one, then you +have to use `--diff-algorithm=default` option. + --stat[=<width>[,<name-width>[,<count>]]]:: Generate a diffstat. By default, as much space as necessary will be used for the filename part, and the rest for the graph |