From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 30 Jun 2017 20:12:34 +0000 (-0700)
Subject: Merge branch 'sb/hashmap-customize-comparison' into sb/diff-color-move
X-Git-Tag: v2.15.0-rc0~130^2~25
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2cfb6cec9446c6e25c82fd8f4fd92f55f04a4c98

Merge branch 'sb/hashmap-customize-comparison' into sb/diff-color-move

* sb/hashmap-customize-comparison: (566 commits)
hashmap: migrate documentation from Documentation/technical into header
patch-ids.c: use hashmap correctly
hashmap.h: compare function has access to a data field
Twelfth batch for 2.14
Git 2.13.2
Eleventh batch for 2.14
Revert "split-index: add and use unshare_split_index()"
Tenth batch for 2.14
add--interactive: quote commentChar regex
add--interactive: handle EOF in prompt_yesno
auto-correct: tweak phrasing
docs: update 64-bit core.packedGitLimit default
t7508: fix a broken indentation
grep: fix erroneously copy/pasted variable in check/assert pattern
Ninth batch for 2.14
glossary: define 'stash entry'
status: add optional stash count information
stash: update documentation to use 'stash entry'
for_each_bisect_ref(): don't trim refnames
mergetools/meld: improve compatibiilty with Meld on macOS X
...
---

2cfb6cec9446c6e25c82fd8f4fd92f55f04a4c98