diff options
| author |  Elijah Newren <newren@gmail.com> | 2021-08-04 23:50:47 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-08-05 08:57:39 -0700 |
| commit | e80178eac6f3513bed7ec7ead9d5b0ebfa429241 (patch) | |
| tree | d99e845d83a1a716c8c8b036fbd39190afc92e35 /Documentation/merge-options.txt | |
| parent | directory-rename-detection.txt: small updates due to merge-ort optimizations (diff) | |
| download | tgif-e80178eac6f3513bed7ec7ead9d5b0ebfa429241.tar.xz | |
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 'Documentation/merge-options.txt')
| -rw-r--r-- | Documentation/merge-options.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index eb0aabd396..f819bd8dd6 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt @@ -112,8 +112,8 @@ With --squash, --commit is not allowed, and will fail. Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. If there is no `-s` option, a built-in list of strategies - is used instead ('git merge-recursive' when merging a single - head, 'git merge-octopus' otherwise). + is used instead (`recursive` when merging a single head, + `octopus` otherwise). -X <option>:: --strategy-option=<option>:: |