From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Jul 2018 19:20:33 +0000 (-0700)
Subject: Merge branch 'en/rebase-i-microfixes'
X-Git-Tag: v2.19.0-rc0~151
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b345b77b3a10dc94c2130669ce27bf61eddaabee;p=thirdparty%2Fgit.git

Merge branch 'en/rebase-i-microfixes'

* en/rebase-i-microfixes:
  git-rebase--merge: modernize "git-$cmd" to "git $cmd"
  Fix use of strategy options with interactive rebases
  t3418: add testcase showing problems with rebase -i and strategy options
---

b345b77b3a10dc94c2130669ce27bf61eddaabee