| commit | 29d03f84a1bd0e27ab172bcd80382c5e2e8df1ec | |
| author | Elijah Newren <newren@gmail.com> | |
| Thu, 14 Feb 2019 20:25:41 +0000 (14 12:25 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 14 Feb 2019 21:23:58 +0000 (14 13:23 -0800) | ||
| tree | 248b6181c98a6e280360494034fbcb15090233f5 | treesnapshot (tar.gz zip) |
| parent | 68aa495b590d417e88562ab1e5da7d84d0531f21 | commitdiff |
git-rebase.txt: update to reflect merge now implemented on sequencer
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>
Signed-off-by: Junio C Hamano <gitster@pobox.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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/git-rebase.txt | diffblobblamehistory |