summaryrefslogtreecommitdiffstats
path: root/contrib/examples/git-merge.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-04-10 09:28:24 +0200
committerJunio C Hamano <gitster@pobox.com>2018-04-10 09:28:24 +0200
commitaa1c2b6804808b127620772fa959a6b4c8556d2a (patch)
tree310b26399d82afd4be501ea796fe6952bf1e63f1 /contrib/examples/git-merge.sh
parentMerge branch 'yk/filter-branch-non-committish-refs' (diff)
parentbisect: use oid_to_hex() for converting object_id hashes to hex strings (diff)
downloadgit-aa1c2b6804808b127620772fa959a6b4c8556d2a.tar.xz
git-aa1c2b6804808b127620772fa959a6b4c8556d2a.zip
Merge branch 'ys/bisect-object-id-missing-conversion-fix'
Code clean-up. * ys/bisect-object-id-missing-conversion-fix: bisect: use oid_to_hex() for converting object_id hashes to hex strings
Diffstat (limited to 'contrib/examples/git-merge.sh')
0 files changed, 0 insertions, 0 deletions