summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool.txt
diff options
context:
space:
mode:
authorLibravatar Stefan Beller <sbeller@google.com>2017-08-15 13:13:19 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-08-15 14:39:25 -0700
commit2456990dfd93dee6d1906d774db112056534b57b (patch)
tree77e29099725f97489df2447d834a4ce5c9c94609 /Documentation/git-mergetool.txt
parentalternates: provide helper for adding to alternates list (diff)
downloadtgif-2456990dfd93dee6d1906d774db112056534b57b.tar.xz
sha1_file: make read_info_alternates static
read_info_alternates is not used from outside, so let's make it static. We have to declare the function before link_alt_odb_entry instead of moving the code around, link_alt_odb_entry calls read_info_alternates, which in turn calls link_alt_odb_entry. Signed-off-by: Stefan Beller <sbeller@google.com> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions