| commit | 99f5b0845ac53f9f6e845fe4401e68fcef154690 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 29 Mar 2010 04:52:28 +0000 (28 21:52 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 29 Mar 2010 04:52:28 +0000 (28 21:52 -0700) | ||
| tree | 5647dacc82fa90cb8de24ec4f4b9abea249707cf | treesnapshot (tar.gz zip) |
| parent | 3b37d9c17efd199a237435f7d8573008f6aa68c1 | commitdiff |
| parent | 28db756feead84929cdfaaee8bccd301384daab4 | commitdiff |
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
* 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
| builtin/merge.c | diff1 | diff2 | blobhistory |
| builtin/revert.c | diff1 | diff2 | blobhistory |
| cache.h | diff1 | diff2 | blobhistory |
| git-rebase--interactive.sh | diff1 | diff2 | blobhistory |