From b36ade216c4a72dda6b8e3006cd3ded44ece1c66 Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Wed, 4 Aug 2021 23:50:51 +0000 Subject: [PATCH] merge-strategies.txt: fix simple capitalization error Acked-by: Derrick Stolee Acked-by: Johannes Schindelin Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano --- Documentation/git-rebase.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index c3edcb07e3..cecdcfff47 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -529,7 +529,7 @@ The `--rebase-merges` mode is similar in spirit to the deprecated where commits can be reordered, inserted and dropped at will. + It is currently only possible to recreate the merge commits using the -`recursive` merge strategy; Different merge strategies can be used only via +`recursive` merge strategy; different merge strategies can be used only via explicit `exec git merge -s [...]` commands. + See also REBASING MERGES and INCOMPATIBLE OPTIONS below.