aca13c2355
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 |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| api-error-handling.txt | ||
| api-index-skel.txt | ||
| api-index.sh | ||
| api-merge.txt | ||
| api-parse-options.txt | ||
| api-simple-ipc.txt | ||
| api-trace2.txt | ||
| bitmap-format.txt | ||
| bundle-format.txt | ||
| chunk-format.txt | ||
| commit-graph-format.txt | ||
| commit-graph.txt | ||
| directory-rename-detection.txt | ||
| hash-function-transition.txt | ||
| http-protocol.txt | ||
| index-format.txt | ||
| long-running-process-protocol.txt | ||
| multi-pack-index.txt | ||
| pack-format.txt | ||
| pack-heuristics.txt | ||
| pack-protocol.txt | ||
| packfile-uri.txt | ||
| parallel-checkout.txt | ||
| partial-clone.txt | ||
| protocol-capabilities.txt | ||
| protocol-common.txt | ||
| protocol-v2.txt | ||
| racy-git.txt | ||
| reftable.txt | ||
| remembering-renames.txt | ||
| repository-version.txt | ||
| rerere.txt | ||
| send-pack-pipeline.txt | ||
| shallow.txt | ||
| signature-format.txt | ||
| sparse-index.txt | ||
| trivial-merge.txt | ||