From: "Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Eric Sunshine <sunshine@sunshineco.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Junio C Hamano <gitster@pobox.com>,
Elijah Newren <newren@gmail.com>,
Elijah Newren <newren@gmail.com>
Subject: [PATCH v2 07/10] merge-strategies.txt: fix simple capitalization error
Date: Wed, 04 Aug 2021 05:28:52 +0000 [thread overview]
Message-ID: <d1521f98deec5973718dabe5051f55383dbb05b8.1628054936.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1059.v2.git.git.1628054935.gitgitgadget@gmail.com>
From: Elijah Newren <newren@gmail.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
---
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 <strategy> [...]` commands.
+
See also REBASING MERGES and INCOMPATIBLE OPTIONS below.
--
gitgitgadget
next prev parent reply other threads:[~2021-08-04 5:29 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-03 15:35 [PATCH 00/10] Documentation updates: merge-strategies Elijah Newren via GitGitGadget
2021-08-03 15:35 ` [PATCH 01/10] git-rebase.txt: correct antiquated claims about --rebase-merges Elijah Newren via GitGitGadget
2021-08-03 22:53 ` Johannes Schindelin
2021-08-03 15:35 ` [PATCH 02/10] directory-rename-detection.txt: small updates due to merge-ort optimizations Elijah Newren via GitGitGadget
2021-08-04 0:06 ` Junio C Hamano
2021-08-03 15:35 ` [PATCH 03/10] Documentation: edit awkward references to `git merge-recursive` Elijah Newren via GitGitGadget
2021-08-04 0:14 ` Junio C Hamano
2021-08-04 0:19 ` Elijah Newren
2021-08-03 15:35 ` [PATCH 04/10] merge-strategies.txt: update wording for the resolve strategy Elijah Newren via GitGitGadget
2021-08-04 0:19 ` Junio C Hamano
2021-08-04 0:37 ` Elijah Newren
2021-08-04 2:01 ` Junio C Hamano
2021-08-03 15:35 ` [PATCH 05/10] merge-strategies.txt: do not imply using copy detection is desired Elijah Newren via GitGitGadget
2021-08-03 22:56 ` Johannes Schindelin
2021-08-04 0:21 ` Junio C Hamano
2021-08-03 15:35 ` [PATCH 06/10] merge-strategies.txt: avoid giving special preference to patience algorithm Elijah Newren via GitGitGadget
2021-08-03 17:00 ` Eric Sunshine
2021-08-03 15:35 ` [PATCH 07/10] merge-strategies.txt: explain why no-renames might be useful Elijah Newren via GitGitGadget
2021-08-04 0:28 ` Junio C Hamano
2021-08-04 0:44 ` Elijah Newren
2021-08-04 2:05 ` Junio C Hamano
2021-08-03 15:35 ` [PATCH 08/10] merge-strategies.txt: fix simple capitalization error Elijah Newren via GitGitGadget
2021-08-03 23:01 ` Johannes Schindelin
2021-08-03 23:32 ` Elijah Newren
2021-08-04 21:42 ` Johannes Schindelin
2021-08-03 15:35 ` [PATCH 09/10] Documentation: add coverage of the `ort` merge strategy Elijah Newren via GitGitGadget
2021-08-03 23:03 ` Johannes Schindelin
2021-08-03 23:43 ` Elijah Newren
2021-08-04 0:33 ` Junio C Hamano
2021-08-04 0:39 ` Elijah Newren
2021-08-03 15:35 ` [PATCH 10/10] Update error message and code comment Elijah Newren via GitGitGadget
2021-08-03 23:05 ` Johannes Schindelin
2021-08-03 23:49 ` Elijah Newren
2021-08-03 23:06 ` [PATCH 00/10] Documentation updates: merge-strategies Johannes Schindelin
2021-08-04 5:28 ` [PATCH v2 " Elijah Newren via GitGitGadget
2021-08-04 5:28 ` [PATCH v2 01/10] git-rebase.txt: correct antiquated claims about --rebase-merges Elijah Newren via GitGitGadget
2021-08-04 5:28 ` [PATCH v2 02/10] directory-rename-detection.txt: small updates due to merge-ort optimizations Elijah Newren via GitGitGadget
2021-08-04 5:28 ` [PATCH v2 03/10] Documentation: edit awkward references to `git merge-recursive` Elijah Newren via GitGitGadget
2021-08-04 5:28 ` [PATCH v2 04/10] merge-strategies.txt: update wording for the resolve strategy Elijah Newren via GitGitGadget
2021-08-04 5:28 ` [PATCH v2 05/10] merge-strategies.txt: do not imply using copy detection is desired Elijah Newren via GitGitGadget
2021-08-04 5:28 ` [PATCH v2 06/10] merge-strategies.txt: avoid giving special preference to patience algorithm Elijah Newren via GitGitGadget
2021-08-04 5:28 ` Elijah Newren via GitGitGadget [this message]
2021-08-04 5:28 ` [PATCH v2 08/10] git-rebase.txt: correct out-of-date and misleading text about renames Elijah Newren via GitGitGadget
2021-08-04 15:50 ` Ramsay Jones
2021-08-04 17:18 ` Elijah Newren
2021-08-04 5:28 ` [PATCH v2 09/10] merge-strategies.txt: add coverage of the `ort` merge strategy Elijah Newren via GitGitGadget
2021-08-04 5:28 ` [PATCH v2 10/10] Update error message and code comment Elijah Newren via GitGitGadget
2021-08-04 6:12 ` [PATCH v2 00/10] Documentation updates: merge-strategies Junio C Hamano
2021-08-04 14:56 ` Derrick Stolee
2021-08-04 21:47 ` Johannes Schindelin
2021-08-04 23:50 ` [PATCH v3 " Elijah Newren via GitGitGadget
2021-08-04 23:50 ` [PATCH v3 01/10] git-rebase.txt: correct antiquated claims about --rebase-merges Elijah Newren via GitGitGadget
2021-08-04 23:50 ` [PATCH v3 02/10] directory-rename-detection.txt: small updates due to merge-ort optimizations Elijah Newren via GitGitGadget
2021-08-04 23:50 ` [PATCH v3 03/10] Documentation: edit awkward references to `git merge-recursive` Elijah Newren via GitGitGadget
2021-08-04 23:50 ` [PATCH v3 04/10] merge-strategies.txt: update wording for the resolve strategy Elijah Newren via GitGitGadget
2021-08-04 23:50 ` [PATCH v3 05/10] merge-strategies.txt: do not imply using copy detection is desired Elijah Newren via GitGitGadget
2021-08-04 23:50 ` [PATCH v3 06/10] merge-strategies.txt: avoid giving special preference to patience algorithm Elijah Newren via GitGitGadget
2021-08-04 23:50 ` [PATCH v3 07/10] merge-strategies.txt: fix simple capitalization error Elijah Newren via GitGitGadget
2021-08-04 23:50 ` [PATCH v3 08/10] git-rebase.txt: correct out-of-date and misleading text about renames Elijah Newren via GitGitGadget
2021-08-04 23:50 ` [PATCH v3 09/10] merge-strategies.txt: add coverage of the `ort` merge strategy Elijah Newren via GitGitGadget
2021-08-04 23:50 ` [PATCH v3 10/10] Update error message and code comment Elijah Newren via GitGitGadget
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d1521f98deec5973718dabe5051f55383dbb05b8.1628054936.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@gmail.com \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.