merge-strategies.txt: fix simple capitalization error
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
b36ade216c4a72dda6b8e3006cd3ded44ece1c66
1 file changed
+1
-1
Documentation/git-rebase.txt
+1
-1
@@ -529,7 +529,7 @@ The `--rebase-merges` mode is similar in spirit to the deprecated
529
where commits can be reordered, inserted and dropped at will.
530
+
531
It is currently only possible to recreate the merge commits using the
532
-`recursive` merge strategy; Different merge strategies can be used only via
532
+`recursive` merge strategy; different merge strategies can be used only via
533
explicit `exec git merge -s <strategy> [...]` commands.
534
+
535
See also REBASING MERGES and INCOMPATIBLE OPTIONS below.