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/gitfaq.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/gitfaq.txt')
| -rw-r--r-- | Documentation/gitfaq.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/gitfaq.txt b/Documentation/gitfaq.txt index afdaeab850..8c1f2d5675 100644 --- a/Documentation/gitfaq.txt +++ b/Documentation/gitfaq.txt @@ -275,7 +275,7 @@ best to always use a regular merge commit. [[merge-two-revert-one]] If I make a change on two branches but revert it on one, why does the merge of those branches include the change?:: - By default, when Git does a merge, it uses a strategy called the recursive + By default, when Git does a merge, it uses a strategy called the `ort` strategy, which does a fancy three-way merge. In such a case, when Git performs the merge, it considers exactly three points: the two heads and a third point, called the _merge base_, which is usually the common ancestor of |