summaryrefslogtreecommitdiff
path: root/builtin/merge-file.c
diff options
context:
space:
mode:
authorLibravatar brian m. carlson <sandals@crustytoothpaste.net>2017-05-01 02:29:02 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-05-02 10:48:02 +0900
commit8bc095f7d5b847501e06e8bc1eafc50a314b99b9 (patch)
treea79b19810e28ddf5c4cc8f07a8ff384dcfb769b0 /builtin/merge-file.c
parentbuiltin/blame: convert static function to struct object_id (diff)
downloadtgif-8bc095f7d5b847501e06e8bc1eafc50a314b99b9.tar.xz
builtin/rev-parse: convert to struct object_id
Some of the functions converted are callers of lookup_commit_reference. However, the changes involved in converting the entire thing are not too large, so we might as well convert it all. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions