diff options
| author | Elijah Newren <newren@gmail.com> | 2021-08-04 23:50:51 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-08-05 08:57:40 -0700 |
| commit | b36ade216c4a72dda6b8e3006cd3ded44ece1c66 (patch) | |
| tree | 7c1359950fd97c74549b7588bc35c460ffd772d4 /Documentation/git-rebase.txt | |
| parent | 4d15c85556891bfdddfb90b6be056b08079696bb (diff) | |
| download | git-b36ade216c4a72dda6b8e3006cd3ded44ece1c66.tar.gz | |
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>
Diffstat (limited to 'Documentation/git-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 2 |
1 files changed, 1 insertions, 1 deletions
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. |