summaryrefslogtreecommitdiff
path: root/Documentation/diff-algorithm-option.adoc
blob: 8e3a0b63d784d8b68fdaf83ae1fba495b656d426 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
`--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 the `diff.algorithm` variable to a
non-default value and want to use the default one, then you
have to use `--diff-algorithm=default` option.