{"thread":{"id":"50512","subject":"[PATCH] git-rebase.txt: update to reflect merge now implemented on sequencer","startedAt":"2019-02-14T20:25:50Z","lastAt":"2019-02-18T20:37:27Z","messageCount":2,"participants":["Elijah Newren","Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"369337","messageId":"20190214202541.21371-1-newren@gmail.com","threadId":"50512","inReplyTo":null,"subject":"[PATCH] git-rebase.txt: update to reflect merge now implemented on sequencer","fromName":"Elijah Newren","fromEmail":"newren@gmail.com","sentAt":"2019-02-14T20:25:41Z","receivedAt":"2019-02-14T20:25:50Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"Since commit 8fe9c3f21dff (Merge branch 'en/rebase-merge-on-sequencer',\n2019-02-06), --merge now uses the interactive backend (and matches its\nbehavior) so there is no separate merge backend anymore.  Fix an\noversight in the docs that should have been updated with the previous\nchange.\n\nSigned-off-by: Elijah Newren <newren@gmail.com>\n---\n Documentation/git-rebase.txt | 2 --\n 1 file changed, 2 deletions(-)\n\ndiff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\nindex daa16403ec..619303adbc 100644\n--- a/Documentation/git-rebase.txt\n+++ b/Documentation/git-rebase.txt\n@@ -554,8 +554,6 @@ commit started empty (had no changes relative to its parent to\n start with) or ended empty (all changes were already applied\n upstream in other commits).\n \n-The merge backend does the same.\n-\n The interactive backend drops commits by default that\n started empty and halts if it hits a commit that ended up empty.\n The `--keep-empty` option exists for the interactive backend to allow\n-- \n2.21.0.rc0.269.g1a574e7a28\n\n"},{"id":"369554","messageId":"nycvar.QRO.7.76.6.1902182136560.45@tvgsbejvaqbjf.bet","threadId":"50512","inReplyTo":"20190214202541.21371-1-newren@gmail.com","subject":"Re: [PATCH] git-rebase.txt: update to reflect merge now implemented on sequencer","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2019-02-18T20:37:21Z","receivedAt":"2019-02-18T20:37:27Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Elijah,\n\nOn Thu, 14 Feb 2019, Elijah Newren wrote:\n\n> Since commit 8fe9c3f21dff (Merge branch 'en/rebase-merge-on-sequencer',\n> 2019-02-06), --merge now uses the interactive backend (and matches its\n> behavior) so there is no separate merge backend anymore.  Fix an\n> oversight in the docs that should have been updated with the previous\n> change.\n> \n> Signed-off-by: Elijah Newren <newren@gmail.com>\n\nACK,\nDscho\n\n> ---\n>  Documentation/git-rebase.txt | 2 --\n>  1 file changed, 2 deletions(-)\n> \n> diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\n> index daa16403ec..619303adbc 100644\n> --- a/Documentation/git-rebase.txt\n> +++ b/Documentation/git-rebase.txt\n> @@ -554,8 +554,6 @@ commit started empty (had no changes relative to its parent to\n>  start with) or ended empty (all changes were already applied\n>  upstream in other commits).\n>  \n> -The merge backend does the same.\n> -\n>  The interactive backend drops commits by default that\n>  started empty and halts if it hits a commit that ended up empty.\n>  The `--keep-empty` option exists for the interactive backend to allow\n> -- \n> 2.21.0.rc0.269.g1a574e7a28\n> \n> \n"}]}