Thread (3 messages) flat view 3 messages, 2 authors, 2019-11-11

Re: [PATCH] doc: improve readability of --rebase-merges in git-rebase

From: Junio C Hamano <hidden>
Date: 2019-11-11 09:08:09

Possibly related (same subject, not in this thread)

Naveen Nathan [off-list ref] writes:
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.

...
-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.
I think the original "to the deprecated `--preserve-merges`" is
mildly easier to follow than "to `--preserve-merges` (deprecated)".

The later part of the sentence with this patch does read smoother
and is a definite improvement.

Thanks.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help