https://github.com/git/git
Revision 29d03f84a1bd0e27ab172bcd80382c5e2e8df1ec authored by Elijah Newren on 14 February 2019, 20:25:41 UTC, committed by Junio C Hamano on 14 February 2019, 21:23:58 UTC
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>
1 parent 68aa495
History
Tip revision: 29d03f84a1bd0e27ab172bcd80382c5e2e8df1ec authored by Elijah Newren on 14 February 2019, 20:25:41 UTC
git-rebase.txt: update to reflect merge now implemented on sequencer
Tip revision: 29d03f8
File Mode Size
files-backend.c -rw-r--r-- 85.4 KB
iterator.c -rw-r--r-- 10.5 KB
packed-backend.c -rw-r--r-- 44.1 KB
packed-backend.h -rw-r--r-- 1.2 KB
ref-cache.c -rw-r--r-- 14.0 KB
ref-cache.h -rw-r--r-- 8.9 KB
refs-internal.h -rw-r--r-- 23.8 KB

back to top