Merge branch 'pm/build-persistent-https-with-recent-go' into maint
commitd1d9c3cc608ca281c1bd9b40b14fa8d60cb64773
authorJunio C Hamano <gitster@pobox.com>
Wed, 10 Aug 2016 18:55:27 +0000 (10 11:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 10 Aug 2016 18:55:27 +0000 (10 11:55 -0700)
tree60b1ec8792779e82d000a7cf6c8c30a9b025e3e8
parent366d2d5f485c7d0b288520c4f7249e0380c5a9b3
parentaccb613afd2298510f6fc02e0ed05ecb84f6a6ff
Merge branch 'pm/build-persistent-https-with-recent-go' into maint

The build procedure for "git persistent-https" helper (in contrib/)
has been updated so that it can be built with more recent versions
of Go.

* pm/build-persistent-https-with-recent-go:
  contrib/persistent-https: use Git version for build label
  contrib/persistent-https: update ldflags syntax for Go 1.7+