]> git.ipfire.org Git - thirdparty/git.git/commit
Documentation: edit awkward references to `git merge-recursive`
authorElijah Newren <newren@gmail.com>
Wed, 4 Aug 2021 23:50:47 +0000 (23:50 +0000)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Aug 2021 15:57:39 +0000 (08:57 -0700)
commite80178eac6f3513bed7ec7ead9d5b0ebfa429241
treed99e845d83a1a716c8c8b036fbd39190afc92e35
parentb378df72ed147d346503341db06771c52cd2dbb8
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>
Documentation/git-rebase.txt
Documentation/merge-options.txt
Documentation/merge-strategies.txt