From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 20 Aug 2018 18:33:48 +0000 (-0700)
Subject: Merge branch 'js/rebase-merges-exec-fix'
X-Git-Tag: v2.19.0-rc0~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=750eb11d8f53feba4a797c1be1a0ad2f68f88879;p=thirdparty%2Fgit.git

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
---

750eb11d8f53feba4a797c1be1a0ad2f68f88879