summaryrefslogtreecommitdiff
path: root/xdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-03-29 04:52:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-03-29 04:52:28 (GMT)
commit99f5b0845ac53f9f6e845fe4401e68fcef154690 (patch)
tree5647dacc82fa90cb8de24ec4f4b9abea249707cf /xdiff
parent3b37d9c17efd199a237435f7d8573008f6aa68c1 (diff)
parent28db756feead84929cdfaaee8bccd301384daab4 (diff)
downloadgit-99f5b0845ac53f9f6e845fe4401e68fcef154690.zip
git-99f5b0845ac53f9f6e845fe4401e68fcef154690.tar.gz
git-99f5b0845ac53f9f6e845fe4401e68fcef154690.tar.bz2
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 'xdiff')
0 files changed, 0 insertions, 0 deletions