Merge branch 'mb/rebase-i-no-ff'
* mb/rebase-i-no-ff: Teach rebase the --no-ff option. Conflicts: git-rebase--interactive.sh t/t3404-rebase-interactive.sh
Junio C Hamano committed
Apr 3, 2010 at 12:28 UTC
9234b003726556e0d3d0ea8ade97dc9f7bd50a6e
No changes.