summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-06-22 09:45:21 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-06-22 09:45:21 -0700
commit8c7da8690d2dfc84c9f827796bc730d900b5fba7 (patch)
treee61ba7ae6c62f649622a268f64169af0036a9ce3 /git-mergetool.sh
parentMerge branch 'jc/rev-list-ancestry-path' (diff)
parentDocumentation/revert: describe passing more than one commit (diff)
downloadtgif-8c7da8690d2dfc84c9f827796bc730d900b5fba7.tar.xz
Merge branch 'cc/cherry-pick-series'
* cc/cherry-pick-series: Documentation/revert: describe passing more than one commit Documentation/cherry-pick: describe passing more than one commit revert: add tests to check cherry-picking many commits revert: allow cherry-picking more than one commit revert: change help_msg() to take no argument revert: refactor code into a do_pick_commit() function revert: use run_command_v_opt() instead of execv_git_cmd() revert: cleanup code for -x option
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions