Revert "Merge branch 'js/rebase-recreate-merge' into next"
authorJunio C Hamano <gitster@pobox.com>
Tue, 20 Mar 2018 19:19:38 +0000 (12:19 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 20 Mar 2018 19:19:38 +0000 (12:19 -0700)
commit6958c94...2f8fa8321e1363f49f14496ed7425d19
tree227a256...7fda05804af5dfa7522b0ad39c0bb7cbcopy hash to clipboard (tree)
parent781580f...679f50236500c245d8d9bd6bf7afb629copy hash to clipboard (diff)
13 files changed:
Documentation/config.txt
Documentation/git-pull.txt
Documentation/git-rebase.txt
builtin/pull.c
builtin/rebase--helper.c
builtin/remote.c
contrib/completion/git-completion.bash
git-rebase--interactive.sh
git-rebase.sh
refs.c
sequencer.c
sequencer.h
t/t3430-rebase-recreate-merges.sh [deleted file]