summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-tree.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-02-03 11:25:19 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-02-03 11:25:19 -0800
commit36acf41239a7406d52faf1b6c757ffe34e3be98d (patch)
tree47d07010f6c7c0fa066105f034759398dc767993 /Documentation/git-merge-tree.txt
parentMerge branch 'js/re-running-failed-tests' (diff)
parentcheckout: convert post_checkout_hook() to struct object_id (diff)
downloadtgif-36acf41239a7406d52faf1b6c757ffe34e3be98d.tar.xz
Merge branch 'rs/object-id'
"uchar [40]" to "struct object_id" conversion continues. * rs/object-id: checkout: convert post_checkout_hook() to struct object_id use oidcpy() for copying hashes between instances of struct object_id use oid_to_hex_r() for converting struct object_id hashes to hex strings
Diffstat (limited to 'Documentation/git-merge-tree.txt')
0 files changed, 0 insertions, 0 deletions