summaryrefslogtreecommitdiff
path: root/xdiff/xmerge.c
diff options
context:
space:
mode:
authorLibravatar Johannes Sixt <johannes.sixt@telecom.at>2008-05-23 16:13:05 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-05-23 15:52:20 -0700
commite00f3790b88ce61f1bdc863011a122b98b43197e (patch)
tree6809a130203b95cc36516bf8b2c9dd2bababf4c4 /xdiff/xmerge.c
parentgit-am: fix typo in usage message (diff)
downloadtgif-e00f3790b88ce61f1bdc863011a122b98b43197e.tar.xz
rev-parse --symbolic-full-name: don't print '^' if SHA1 is not a ref
The intention of --symbolic-full-name is to not print anything if a revision is not an exact ref. But this command: $ git-rev-parse --symbolic-full-name --not master~1 still emitted a sole '^' to stdout (provided that there's no other ref at master~1). This fixes it. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions