From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 3 Apr 2010 19:28:44 +0000 (-0700)
Subject: Merge branch 'mb/rebase-i-no-ff'
X-Git-Tag: v1.7.1-rc0~9
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9234b003726556e0d3d0ea8ade97dc9f7bd50a6e?hp=9234b003726556e0d3d0ea8ade97dc9f7bd50a6e

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
---