diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-10-12 13:51:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-12 13:51:22 -0700 |
| commit | 77357e806f29a4d8e824b755631db7edabca39e7 (patch) | |
| tree | c1caed60cd9072aaa8623f25efe868c725aa0721 /ll-merge.c | |
| parent | Merge branch 'ab/bundle-doc' into maint (diff) | |
| parent | Update error message and code comment (diff) | |
| download | tgif-77357e806f29a4d8e824b755631db7edabca39e7.tar.xz | |
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
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions