summaryrefslogtreecommitdiff
path: root/merge-file.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-12-17 19:27:49 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2006-12-17 19:36:50 -0800
commit64fe031a7a78894955af217335b46059a36a582d (patch)
treef46b38f6a560546532dc34f5769fa5a0dfbe7472 /merge-file.c
parentshow-ref: fix --quiet --verify (diff)
downloadtgif-64fe031a7a78894955af217335b46059a36a582d.tar.xz
show-ref: fix --verify --hash=length
An earlier optimization for --verify broke a lot of stuff because it did not take interaction with other flags into account. This also fixes an unrelated argument parsing error; --hash=8 should mean the same as "--hash --abbrev=8". Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions