Junio C Hamano 5589b26544 Merge branch 'cc/cherry-pick-ff' into next ...

* cc/cherry-pick-ff:
  rebase -i: use new --ff cherry-pick option
  cherry-pick: add a no-op --no-ff option to future proof scripts
  Documentation: describe new cherry-pick --ff option
  cherry-pick: add tests for new --ff option
  revert: add --ff option to allow fast forward when cherry-picking
  builtin/merge: make checkout_fast_forward() non static
  parse-options: add parse_options_concat() to concat options

2010-03-07 12:50:12 -08:00

37 KiB

Raw Blame History

View Raw