From: Junio C Hamano <gitster@pobox.com>
To: Naveen Nathan <naveen@lastninja.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] doc: improve readability of --rebase-merges in git-rebase
Date: Mon, 11 Nov 2019 18:08:03 +0900 [thread overview]
Message-ID: <xmqqr22ehjbg.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20191110095942.GB6071@a.local> (Naveen Nathan's message of "Sun, 10 Nov 2019 20:59:42 +1100")
Naveen Nathan <naveen@lastninja.net> 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.
next prev parent reply other threads:[~2019-11-11 9:08 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-10 9:59 [PATCH] doc: improve readability of --rebase-merges in git-rebase Naveen Nathan
2019-11-11 8:49 ` Johannes Schindelin
2019-11-11 9:08 ` Junio C Hamano [this message]
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:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqr22ehjbg.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=naveen@lastninja.net \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).