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

diff --cc git-rebase--merge.sh
Simple merge

diff --cc git-rebase.sh
Simple merge

diff --cc sequencer.c
Simple merge

diff --cc t/t3418-rebase-continue.sh
Simple merge