pr-git-1059/newren/ort-doc-updates-v3
tagged this
04 Aug 23:50
I noticed while updating my switch-default-merge-strategy-to-ort submission, that many of the changes were good documentation updates that we might want for Git v2.33.0. So I pulled those changes out and split them into lots of little commits so that if any parts need discussion or are objectionable, we can just drop those from this series and apply the rest for v2.33.0. The first 9 commits are just small documentation updates, but there is one commit at the end that updates an error message and a code comment. Changes since v1: * Multiple tweaks suggested by Eric, Dscho, and Junio * Removed patch 7 explaining no-renames since that probably belongs in git diff --no-renames instead, and this series is about merge-strategies. * Inserted a new patch 8 that strikes some misleading or at least no-longer-important text from git-rebase.txt (due changes back in late 2006). Changes since v2: * Removed sentence from commit message of patch 8 referring to a change in v1 that was since removed. * Added Stolee's and Dscho's Acked-bys. Elijah Newren (10): git-rebase.txt: correct antiquated claims about --rebase-merges directory-rename-detection.txt: small updates due to merge-ort optimizations Documentation: edit awkward references to `git merge-recursive` merge-strategies.txt: update wording for the resolve strategy merge-strategies.txt: do not imply using copy detection is desired merge-strategies.txt: avoid giving special preference to patience algorithm merge-strategies.txt: fix simple capitalization error git-rebase.txt: correct out-of-date and misleading text about renames merge-strategies.txt: add coverage of the `ort` merge strategy Update error message and code comment Documentation/git-rebase.txt | 27 ++++++----- Documentation/merge-options.txt | 4 +- Documentation/merge-strategies.txt | 48 +++++++++++-------- .../technical/directory-rename-detection.txt | 14 +++--- builtin/merge.c | 2 +- sequencer.c | 2 +- 6 files changed, 55 insertions(+), 42 deletions(-) base-commit: 66262451ec94d30ac4b80eb3123549cf7a788afd Submitted-As: https://lore.kernel.org/git/pull.1059.v3.git.git.1628121054.gitgitgadget@gmail.com In-Reply-To: https://lore.kernel.org/git/pull.1059.git.git.1628004920.gitgitgadget@gmail.com In-Reply-To: https://lore.kernel.org/git/pull.1059.v2.git.git.1628054935.gitgitgadget@gmail.com
Assets 2
-
2021-08-04T23:50:54Z -
2021-08-04T23:50:54Z -