From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 11 Jul 2013 20:05:58 +0000 (-0700)
Subject: Merge branch 'af/rebase-i-merge-options'
X-Git-Tag: v1.8.4-rc0~76
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5b6cd0fe7b876698007c55c577ae2afd49b50c2b;p=thirdparty%2Fgit.git

Merge branch 'af/rebase-i-merge-options'

"git rebase -i" now honors --strategy and -X options.

* af/rebase-i-merge-options:
  Do not ignore merge options in interactive rebase
---

5b6cd0fe7b876698007c55c577ae2afd49b50c2b