[PATCH] git-rebase.txt: update to reflect merge now implemented on sequencer

[PATCH] git-rebase.txt: update to reflect merge now implemented on sequencer

[Elijah Newren]

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>
---
 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

Re: [PATCH] git-rebase.txt: update to reflect merge now implemented on sequencer

[Johannes Schindelin]

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
> 
>