OSDN Git Service

Merge branch 'ab/sha1dc-maint' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 7 Jun 2017 00:31:53 +0000 (09:31 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 7 Jun 2017 00:31:53 +0000 (09:31 +0900)
commit76339527ccf7946751174663f9faa686f3f55335
tree821fc80d3f49994c457fb38d3b3779752d70431d
parent2c04f6340579518c55a554fcac9fe21c01b3d3ea
parent6b851e536b05e0c8c61f77b9e4c3e7cedea39ff8
Merge branch 'ab/sha1dc-maint' into maint

* ab/sha1dc-maint:
  sha1dc: update from upstream
  sha1dc: ignore indent-with-non-tab whitespace violations