diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-03-28 21:52:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-28 21:52:28 -0700 |
| commit | 99f5b0845ac53f9f6e845fe4401e68fcef154690 (patch) | |
| tree | 5647dacc82fa90cb8de24ec4f4b9abea249707cf /diffcore.h | |
| parent | 3b37d9c17efd199a237435f7d8573008f6aa68c1 (diff) | |
| parent | 28db756feead84929cdfaaee8bccd301384daab4 (diff) | |
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
Diffstat (limited to 'diffcore.h')
0 files changed, 0 insertions, 0 deletions