From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 29 Mar 2010 04:52:28 +0000 (-0700)
Subject: Merge branch 'cc/cherry-pick-ff'
X-Git-Tag: v1.7.1-rc0~36
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=99f5b0845ac53f9f6e845fe4401e68fcef154690;p=git.git

Merge branch 'cc/cherry-pick-ff'

* cc/cherry-pick-ff:
  revert: fix tiny memory leak in cherry-pick --ff
  rebase -i: use new --ff cherry-pick option
  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
---

99f5b0845ac53f9f6e845fe4401e68fcef154690