summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorLibravatar Harald van Dijk <harald@gigawatt.nl>2020-02-29 13:07:57 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-03-02 12:34:00 -0800
commit237a28173feffc9bdec5aa669aa17fba1ac7c279 (patch)
treeb1733ece07384ae88acf34c6bf89599a3792b5c1 /Documentation/git-merge.txt
parentGit 2.22.2 (diff)
downloadtgif-237a28173feffc9bdec5aa669aa17fba1ac7c279.tar.xz
show_one_mergetag: print non-parent in hex form.
When a mergetag names a non-parent, which can occur after a shallow clone, its hash was previously printed as raw data. Print it in hex form instead. Signed-off-by: Harald van Dijk <harald@gigawatt.nl> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions