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

Junio C Hamano committed Jul 11, 2013 at 13:05 UTC 5b6cd0fe7b876698007c55c577ae2afd49b50c2b

No changes.