Merge branch 'cc/cherry-pick-ff' into next

* cc/cherry-pick-ff:
  rebase -i: use new --ff cherry-pick option
This commit is contained in:
Junio C Hamano
2010-03-20 11:45:36 -07:00

Diff Content Not Available