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.html | |
| parent | d2e30562620c9dda7b685f4d3bcb8acab537d97c (diff) | |
| download | git-htmldocs-7a031e5c8c444cac4c199ecf6538eb89f8862071.tar.gz | |
Autogenerated HTML docs for v2.33.0-113-g6c408
Diffstat (limited to 'gitfaq.html')
| -rw-r--r-- | gitfaq.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gitfaq.html b/gitfaq.html index 90af7073a..dbe65c830 100644 --- a/gitfaq.html +++ b/gitfaq.html @@ -1074,7 +1074,7 @@ If I make a change on two branches but revert it on one, why does the merge of t </dt>
<dd>
<p>
- 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 <code>ort</code>
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 <em>merge base</em>, which is usually the common ancestor of
@@ -1262,7 +1262,7 @@ platform.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-09-29 14:47:55 PDT
+ 2021-08-30 16:49:46 PDT
</div>
</div>
</body>
|