summaryrefslogtreecommitdiff
path: root/mergetools/gvimdiff2
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-10-27 14:58:47 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-10-27 14:58:47 -0700
commitd7ae013a3173c621a3556be6834d459ece60e130 (patch)
tree3fc7d1145c484923f1a006a94029d67ffc56a685 /mergetools/gvimdiff2
parentMerge branch 'lt/abbrev-auto' (diff)
parentfind_unique_abbrev: move logic out of get_short_sha1() (diff)
downloadtgif-d7ae013a3173c621a3556be6834d459ece60e130.tar.xz
Merge branch 'jk/abbrev-auto'
Updates the way approximate count of total objects is computed while attempting to come up with a unique abbreviated object name, which in turn needs to estimate how many hexdigits are necessary to ensure uniqueness. * jk/abbrev-auto: find_unique_abbrev: move logic out of get_short_sha1()
Diffstat (limited to 'mergetools/gvimdiff2')
0 files changed, 0 insertions, 0 deletions