summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-05-08 15:59:18 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-05-08 15:59:18 +0900
commitb7da73ac8b953afd788e096b5b216e3bd9845659 (patch)
tree5230b490ab355c93f807eba61e272d211a3af7a0 /merge-recursive.c
parentMerge branch 'sb/submodule-move-nested' (diff)
parentref-filter: libify get_ref_atom_value() (diff)
downloadtgif-b7da73ac8b953afd788e096b5b216e3bd9845659.tar.xz
Merge branch 'ot/libify-get-ref-atom-value'
Code restructuring, in preparation for further work. * ot/libify-get-ref-atom-value: ref-filter: libify get_ref_atom_value() ref-filter: add return value to parsers ref-filter: change parsing function error handling ref-filter: add return value && strbuf to handlers ref-filter: start adding strbufs with errors ref-filter: add shortcut to work with strbufs
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions