diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-08-30 16:54:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-08-30 16:54:25 -0700 |
| commit | 7a031e5c8c444cac4c199ecf6538eb89f8862071 (patch) | |
| tree | bef184dc029d8342f45d83bace3deeedae0e6b7b /gitfaq.txt | |
| parent | d2e30562620c9dda7b685f4d3bcb8acab537d97c (diff) | |
| download | git-htmldocs-7a031e5c8c444cac4c199ecf6538eb89f8862071.tar.gz | |
Autogenerated HTML docs for v2.33.0-113-g6c408
Diffstat (limited to 'gitfaq.txt')
| -rw-r--r-- | gitfaq.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gitfaq.txt b/gitfaq.txt index afdaeab85..8c1f2d567 100644 --- a/gitfaq.txt +++ b/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 |