rebase: implement --merge via the interactive machinery
authorElijah Newren <newren@gmail.com>
Tue, 11 Dec 2018 16:11:39 +0000 (08:11 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 7 Jan 2019 19:55:23 +0000 (11:55 -0800)
commit68aa495...590d417e88562ab1e5da7d84d0531f21
tree2eac6a5...dc285d5298c44b30444b91a123c1af8bcopy hash to clipboard (tree)
parentc91c944...068e12eca5d4b6040ad05c7068437111copy hash to clipboard (diff)
.gitignore
Documentation/git-rebase.txt
Makefile
builtin/rebase.c
git-legacy-rebase.sh
git-rebase--merge.sh [deleted file]
t/t3406-rebase-message.sh
t/t3420-rebase-autostash.sh
t/t3421-rebase-topology-linear.sh
t/t9903-bash-prompt.sh