summaryrefslogtreecommitdiff
path: root/ll-merge.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-01-13 11:22:38 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-01-13 11:22:38 -0800
commitbe941a2c34d2d37285ee5932190d900b4a034c63 (patch)
treeaab983ca9bc9cba0af2c5d1f7063497ee32df2ab /ll-merge.h
parentMerge branch 'jk/cat-file-regression-fix' into maint (diff)
parentrev-parse: be more careful with munging arguments (diff)
downloadtgif-be941a2c34d2d37285ee5932190d900b4a034c63.tar.xz
Merge branch 'jk/rev-parse-double-dashes' into maint
"git rev-parse <revs> -- <paths>" did not implement the usual disambiguation rules the commands in the "git log" family used in the same way. * jk/rev-parse-double-dashes: rev-parse: be more careful with munging arguments rev-parse: correctly diagnose revision errors before "--"
Diffstat (limited to 'll-merge.h')
0 files changed, 0 insertions, 0 deletions