Merge branch 'pa/auto-gc-mac-osx' into next
commit151ec95f4613425866ccce3a999f8eee0c1bd4ca
authorJunio C Hamano <gitster@pobox.com>
Tue, 16 Jun 2015 21:43:36 +0000 (16 14:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 16 Jun 2015 21:43:36 +0000 (16 14:43 -0700)
tree2043c075afacd70a39d8f1f2379035910275ffe4
parentf0d8e17fca1fddf058fbd5fb96ee445cf58e2e5b
parentc54c7b376d73d2b3780475b18a6039721019aaba
Merge branch 'pa/auto-gc-mac-osx' into next

* pa/auto-gc-mac-osx:
  hooks/pre-auto-gc: adjust power checking for newer OS X