From: Elijah Newren <newren@gmail.com>
Date: Wed, 4 Aug 2021 23:50:51 +0000 (+0000)
Subject: merge-strategies.txt: fix simple capitalization error
X-Git-Tag: v2.33.1~74^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b36ade216c4a72dda6b8e3006cd3ded44ece1c66;p=thirdparty%2Fgit.git

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>
---

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 <strategy> [...]` commands.
 +
 See also REBASING MERGES and INCOMPATIBLE OPTIONS below.