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>
Elijah Newren committed
Aug 4, 2021 at 23:50 UTC
e80178eac6f3513bed7ec7ead9d5b0ebfa429241
3 files changed
+9
-9
Documentation/git-rebase.txt
+2
-3
@@ -354,9 +354,8 @@ See also INCOMPATIBLE OPTIONS below.
354
355
-s <strategy>::
356
--strategy=<strategy>::
357
- Use the given merge strategy.
358
- If there is no `-s` option 'git merge-recursive' is used
359
- instead. This implies --merge.
357
+ Use the given merge strategy, instead of the default
358
+ `recursive`. This implies `--merge`.
359
+
360
Because 'git rebase' replays each commit from the working branch
361
on top of the <upstream> branch using the given strategy, using
Documentation/merge-options.txt
+2
-2
@@ -112,8 +112,8 @@ With --squash, --commit is not allowed, and will fail.
112
Use the given merge strategy; can be supplied more than
113
once to specify them in the order they should be tried.
114
If there is no `-s` option, a built-in list of strategies
115
- is used instead ('git merge-recursive' when merging a single
116
- head, 'git merge-octopus' otherwise).
115
+ is used instead (`recursive` when merging a single head,
116
+ `octopus` otherwise).
117
118
-X <option>::
119
--strategy-option=<option>::
Documentation/merge-strategies.txt
+5
-4
@@ -51,10 +51,11 @@ patience;;
51
See also linkgit:git-diff[1] `--patience`.
52
53
diff-algorithm=[patience|minimal|histogram|myers];;
54
- Tells 'merge-recursive' to use a different diff algorithm, which
55
- can help avoid mismerges that occur due to unimportant matching
56
- lines (such as braces from distinct functions). See also
57
- linkgit:git-diff[1] `--diff-algorithm`.
54
+ Use a different diff algorithm while merging, which can help
55
+ avoid mismerges that occur due to unimportant matching lines
56
+ (such as braces from distinct functions). See also
57
+ linkgit:git-diff[1] `--diff-algorithm`. Defaults to the
58
+ `diff.algorithm` config setting.
59
60
ignore-space-change;;
61
ignore-all-space;;