From: Elijah Newren via GitGitGadget Date: Wed, 04 Aug 2021 23:50:51 GMT Subject: [PATCH v3 07/10] merge-strategies.txt: fix simple capitalization error Message-ID: <2c82aacbcbd752e1944605d370e4d8677f778c73.1628121054.git.gitgitgadget@gmail.com> In-Reply-To: From: Elijah Newren Acked-by: Derrick Stolee Acked-by: Johannes Schindelin Signed-off-by: Elijah Newren --- 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 c3edcb07e3e..cecdcfff47a 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. -- gitgitgadget