list mirror (unofficial, one of many)
 help / color / Atom feed
From: Naveen Nathan <>
Subject: [PATCH] doc: improve readability of --rebase-merges in git-rebase
Date: Sun, 10 Nov 2019 20:59:42 +1100
Message-ID: <20191110095942.GB6071@a.local> (raw)

When --rebase-merges was introduced in 427c3bd28a the sentence
describing the difference between --rebase-merges and --preserve-merges
is a little unclear and difficult to parse. This patch improves readability
while retaining original meaning.

Signed-off-by: Naveen Nathan <>
 Documentation/git-rebase.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 639a4179d1..6a826b47bd 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -442,9 +442,9 @@ i.e. commits that would be excluded by linkgit:git-log[1]'s
 the `rebase-cousins` mode is turned on, such commits are instead rebased
 onto `<upstream>` (or `<onto>`, if specified).
-The `--rebase-merges` mode is similar in spirit to the deprecated
-`--preserve-merges`, but in contrast to that option works well in interactive
-rebases: commits can be reordered, inserted and dropped at will.
+The `--rebase-merges` mode is similar in spirit to `--preserve-merges`
+(deprecated) but actually works with interactive rebases, 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

             reply index

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-10  9:59 Naveen Nathan [this message]
2019-11-11  8:49 ` Johannes Schindelin
2019-11-11  9:08 ` Junio C Hamano
2019-11-11 21:44   ` Naveen Nathan
2019-11-11 23:21   ` [PATCH v2] " Naveen Nathan
2019-11-12  4:18     ` Junio C Hamano

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:

  List information:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191110095942.GB6071@a.local \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link list mirror (unofficial, one of many)

Archives are clonable:
	git clone --mirror
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

Example config snippet for mirrors

Newsgroups are available over NNTP:

 note: .onion URLs require Tor:

AGPL code for this site: git clone