aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/persistent-https
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2021-08-04 23:50:47 +0000
committerJunio C Hamano <gitster@pobox.com>2021-08-05 08:57:39 -0700
commite80178eac6f3513bed7ec7ead9d5b0ebfa429241 (patch)
treed99e845d83a1a716c8c8b036fbd39190afc92e35 /contrib/persistent-https
parentdirectory-rename-detection.txt: small updates due to merge-ort optimizations (diff)
downloadgit-e80178eac6f3513bed7ec7ead9d5b0ebfa429241.tar.gz
git-e80178eac6f3513bed7ec7ead9d5b0ebfa429241.zip
Documentation: edit awkward references to `git merge-recursive`
A few places in the documentation referred to the "`recursive` strategy" using the phrase "`git merge-recursive`", suggesting that it was forking subprocesses to call a toplevel builtin. Perhaps that was relevant to when rebase was a shell script, but it seems like a rather indirect way to refer to the `recursive` strategy. Simplify the references. Acked-by: Derrick Stolee <dstolee@microsoft.com> Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/persistent-https')
0 files changed, 0 insertions, 0 deletions