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)
commit750eb11d8f53feba4a797c1be1a0ad2f68f88879
treee8db3ea760c3abe42d58436547547b80c4fb1238
parent14677d25ab50efcf57621ae69d6ba858a5f86165
parent1ace63bc39a339a1616477644d6c43f570716bcb
Merge branch 'js/rebase-merges-exec-fix'

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
sequencer.c