threads / patch / 50512

patchgit-rebase.txt: update to reflect merge now implemented on sequencer

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

## tl;dr

2 messages between Feb 14, 2019 and Feb 18, 2019. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Elijah Newren· Feb 14, 2019, 20:25 UTC · lore

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(-)
Show changes to Documentation/git-rebase.txt +0 −2
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
Johannes Schindelin· Feb 18, 2019, 20:37 UTC · re: Elijah Newren · lore

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

Hi Elijah,
On Thu, 14 Feb 2019, Elijah Newren wrote:
Show 7 quoted lines
> 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

Show 21 quoted lines
> ---
>  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
> 
>

← back to recent threads