Merge branch 'mb/rebase-i-no-ff'
authorJunio C Hamano <gitster@pobox.com>
Sat, 3 Apr 2010 19:28:44 +0000 (12:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 3 Apr 2010 19:28:44 +0000 (12:28 -0700)
* mb/rebase-i-no-ff:
Teach rebase the --no-ff option.

Conflicts:
git-rebase--interactive.sh
t/t3404-rebase-interactive.sh

No differences found