| 1 | `--diff-algorithm=(patience|minimal|histogram|myers)`:: |
| 2 | Choose a diff algorithm. The variants are as follows: |
| 3 | + |
| 4 | -- |
| 5 | `default`;; |
| 6 | `myers`;; |
| 7 | The basic greedy diff algorithm. Currently, this is the default. |
| 8 | `minimal`;; |
| 9 | Spend extra time to make sure the smallest possible diff is |
| 10 | produced. |
| 11 | `patience`;; |
| 12 | Use "patience diff" algorithm when generating patches. |
| 13 | `histogram`;; |
| 14 | This algorithm extends the patience algorithm to "support |
| 15 | low-occurrence common elements". |
| 16 | -- |
| 17 | + |
| 18 | For instance, if you configured the `diff.algorithm` variable to a |
| 19 | non-default value and want to use the default one, then you |
| 20 | have to use `--diff-algorithm=default` option. |
| 21 | + |
| 22 | Explicitly choosing a diff algorithm on the command line also |
| 23 | bypasses `diff.<driver>.process` (see linkgit:gitattributes[5]). |