From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 12 Oct 2021 20:51:22 +0000 (-0700)
Subject: Merge branch 'en/merge-strategy-docs' into maint
X-Git-Tag: v2.33.1~74
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=77357e806f29a4d8e824b755631db7edabca39e7;p=thirdparty%2Fgit.git

Merge branch 'en/merge-strategy-docs' into maint

Documentation updates.

* en/merge-strategy-docs:
  Update error message and code comment
  merge-strategies.txt: add coverage of the `ort` merge strategy
  git-rebase.txt: correct out-of-date and misleading text about renames
  merge-strategies.txt: fix simple capitalization error
  merge-strategies.txt: avoid giving special preference to patience algorithm
  merge-strategies.txt: do not imply using copy detection is desired
  merge-strategies.txt: update wording for the resolve strategy
  Documentation: edit awkward references to `git merge-recursive`
  directory-rename-detection.txt: small updates due to merge-ort optimizations
  git-rebase.txt: correct antiquated claims about --rebase-merges
---

77357e806f29a4d8e824b755631db7edabca39e7