Merge branch 'jk/negative-hiderefs'
authorJunio C Hamano <gitster@pobox.com>
Wed, 19 Aug 2015 21:48:53 +0000 (14:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 19 Aug 2015 21:48:54 +0000 (14:48 -0700)
A negative !ref entry in multi-value transfer.hideRefs
configuration can be used to say "don't hide this one".

* jk/negative-hiderefs:
refs: support negative transfer.hideRefs
docs/config.txt: reorder hideRefs config

1  2 
Documentation/config.txt
refs.c
Simple merge
diff --cc refs.c
Simple merge