diff options
| author | Elijah Newren <newren@gmail.com> | 2021-08-04 23:50:50 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-08-05 08:57:40 -0700 |
| commit | 4d15c85556891bfdddfb90b6be056b08079696bb (patch) | |
| tree | d99a23bc444d104e24c6fd7cdea56cb2dacafc8f /Documentation/merge-strategies.txt | |
| parent | 002a6dfc7c4642524d1e82f8cf994fc9ea5786f9 (diff) | |
| download | git-4d15c85556891bfdddfb90b6be056b08079696bb.tar.gz | |
merge-strategies.txt: avoid giving special preference to patience algorithm
We already have diff-algorithm that explains why there are special diff
algorithms, so we do not need to re-explain patience. patience exists
as its own toplevel option for historical reasons, but there's no reason
to give it special preference or document it again and suggest it's more
important than other diff algorithms, so just refer to it as a
deprecated shorthand for `diff-algorithm=patience`.
Acked-by: Derrick Stolee <dstolee@microsoft.com>
Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-strategies.txt')
| -rw-r--r-- | Documentation/merge-strategies.txt | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt index e298812458..b54bcf68f2 100644 --- a/Documentation/merge-strategies.txt +++ b/Documentation/merge-strategies.txt @@ -37,11 +37,7 @@ theirs;; no 'theirs' merge strategy to confuse this merge option with. patience;; - With this option, 'merge-recursive' spends a little extra time - to avoid mismerges that sometimes occur due to unimportant - matching lines (e.g., braces from distinct functions). Use - this when the branches to be merged have diverged wildly. - See also linkgit:git-diff[1] `--patience`. + Deprecated synonym for `diff-algorithm=patience`. diff-algorithm=[patience|minimal|histogram|myers];; Use a different diff algorithm while merging, which can help |