Merge branch 'js/rebase-recreate-merge' into next
authorJunio C Hamano <gitster@pobox.com>
Thu, 15 Mar 2018 22:10:57 +0000 (15:10 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 15 Mar 2018 22:10:57 +0000 (15:10 -0700)
commit3d16717...6f948dab40792285885f0298e561ee1b
tree2a03b97...b1e2589bf7f8bd0b67c8c4717af68f1dcopy hash to clipboard (tree)
parentcdbbc66...64dda2a012437c5ab188ca2bf9b7f593copy hash to clipboard (diff)
parent5e05825...e07c16b810f1b996b7eab3527a95a097copy hash to clipboard (diff)
Documentation/config.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
sequencer.c
sequencer.h