Andrew's git / gitweb.git / diff
?
Merge branch 'af/rebase-i-merge-options'
authorJunio C Hamano <gitster@pobox.com>
Thu, 11 Jul 2013 20:05:58 +0000 (13:05 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 11 Jul 2013 20:05:59 +0000 (13:05 -0700)
"git rebase -i" now honors --strategy and -X options.

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

1  2 
git-rebase--interactive.sh patch | diff1 | diff2 | blob | history
diff --cc git-rebase--interactive.sh
Simple merge