From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Elijah Newren <newren@gmail.com>
Cc: gitster@pobox.com, git@vger.kernel.org
Subject: Re: [PATCH] git-rebase.txt: update to reflect merge now implemented on sequencer
Date: Mon, 18 Feb 2019 21:37:21 +0100 (STD) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1902182136560.45@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <20190214202541.21371-1-newren@gmail.com>
Hi Elijah,
On Thu, 14 Feb 2019, Elijah Newren wrote:
> Since commit 8fe9c3f21dff (Merge branch 'en/rebase-merge-on-sequencer',
> 2019-02-06), --merge now uses the interactive backend (and matches its
> behavior) so there is no separate merge backend anymore. Fix an
> oversight in the docs that should have been updated with the previous
> change.
>
> Signed-off-by: Elijah Newren <newren@gmail.com>
ACK,
Dscho
> ---
> Documentation/git-rebase.txt | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
> index daa16403ec..619303adbc 100644
> --- a/Documentation/git-rebase.txt
> +++ b/Documentation/git-rebase.txt
> @@ -554,8 +554,6 @@ commit started empty (had no changes relative to its parent to
> start with) or ended empty (all changes were already applied
> upstream in other commits).
>
> -The merge backend does the same.
> -
> The interactive backend drops commits by default that
> started empty and halts if it hits a commit that ended up empty.
> The `--keep-empty` option exists for the interactive backend to allow
> --
> 2.21.0.rc0.269.g1a574e7a28
>
>
prev parent reply other threads:[~2019-02-18 20:37 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-14 20:25 [PATCH] git-rebase.txt: update to reflect merge now implemented on sequencer Elijah Newren
2019-02-18 20:37 ` Johannes Schindelin [this message]
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=nycvar.QRO.7.76.6.1902182136560.45@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@gmail.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.
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).