git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Elijah Newren <newren@gmail.com>
Date
Feb 14, 2019, 20:25 UTC
Message-ID
<20190214202541.21371-1-newren@gmail.com>

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
Next: Johannes Schindelin
Message 1 of 2 in “git-rebase.txt: update to reflect merge now implemented on sequencer”
  1. git-rebase.txt: update to reflect merge now implemented on sequencerElijah Newren, Feb 14, 2019
  2. Johannes SchindelinFeb 18, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.