Merge branch 'js/rebase-merges-exec-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 20 Aug 2018 18:33:48 +0000 (11:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 20 Aug 2018 18:33:48 +0000 (11:33 -0700)
The "--exec" option to "git rebase --rebase-merges" placed the exec
commands at wrong places, which has been corrected.

* js/rebase-merges-exec-fix:
rebase --exec: make it work with --rebase-merges
t3430: demonstrate what -r, --autosquash & --exec should do

1  2 
sequencer.c
diff --cc sequencer.c
Simple merge