diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-08-30 16:06:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-08-30 16:06:01 -0700 |
| commit | 8778fa8b4f18a3930101825e5bcff62b5348e918 (patch) | |
| tree | 309f07c553653f8f1c2c84b5b506ed47ee48a494 /Documentation/merge-options.txt | |
| parent | aca13c2355e7188432cb32aedf0bb0c477ec011a (diff) | |
| parent | f5a3c5e6377b806c320e4220ba26e467b4c4e992 (diff) | |
| download | git-8778fa8b4f18a3930101825e5bcff62b5348e918.tar.gz | |
Merge branch 'en/ort-becomes-the-default'
Use `ort` instead of `recursive` as the default merge strategy.
* en/ort-becomes-the-default:
Update docs for change of default merge backend
Change default merge backend from recursive to ort
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 86f277a994..61ec157c2f 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt @@ -144,7 +144,7 @@ endif::git-pull[] 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>:: |