diff options
| author | Elijah Newren <newren@gmail.com> | 2021-08-04 05:38:02 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-08-05 15:35:02 -0700 |
| commit | f5a3c5e6377b806c320e4220ba26e467b4c4e992 (patch) | |
| tree | 05ac0b4680ea0a353503b299c8b1bbf9a3585ae1 /Documentation/merge-options.txt | |
| parent | 6a5fb966720fffaae28bbd9408c55414c3b8c813 (diff) | |
| download | git-f5a3c5e6377b806c320e4220ba26e467b4c4e992.tar.gz | |
Update docs for change of default merge backend
Make it clear that `ort` is the default merge strategy now rather than
`recursive`, including moving `ort` to the front of the list of merge
strategies.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-options.txt')
| -rw-r--r-- | Documentation/merge-options.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index f819bd8dd6..72b5318850 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt @@ -112,7 +112,7 @@ With --squash, --commit is not allowed, and will fail. Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. If there is no `-s` option, a built-in list of strategies - is used instead (`recursive` when merging a single head, + is used instead (`ort` when merging a single head, `octopus` otherwise). -X <option>:: |