summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-04-19 13:40:22 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-04-19 13:40:23 -0700
commit4407ea49fe47e90953f187279d55eb93f89a3530 (patch)
tree14c847d0a6b6f48ef68c1c7ebfcb94f29238bf94 /git-merge-resolve.sh
parentMerge branch 'tr/copy-revisions-from-stdin' (diff)
parentcherry-pick: make sure all input objects are commits (diff)
downloadtgif-4407ea49fe47e90953f187279d55eb93f89a3530.tar.xz
Merge branch 'mv/sequencer-pick-error-diag'
"git cherry-pick $blob $tree" is diagnosed as a nonsense. * mv/sequencer-pick-error-diag: cherry-pick: make sure all input objects are commits
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions