Andrew's git / gitweb.git / diff
?
Merge branch 'aw/maint-rebase-i-p-no-ff'
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 May 2011 17:50:00 +0000 (10:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 May 2011 17:50:00 +0000 (10:50 -0700)
* aw/maint-rebase-i-p-no-ff:
git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff

Conflicts:
git-rebase--interactive.sh

No differences found