From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 11 Apr 2018 04:09:54 +0000 (+0900)
Subject: Merge branch 'ab/doc-hash-brokenness'
X-Git-Tag: v2.18.0-rc0~147
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d877975e129e85cde331fc776a2592a6f40f10df;p=thirdparty%2Fgit.git

Merge branch 'ab/doc-hash-brokenness'

Doc updates.

* ab/doc-hash-brokenness:
  doc hash-function-transition: clarify what SHAttered means
  doc hash-function-transition: clarify how older gits die on NewHash
---

d877975e129e85cde331fc776a2592a6f40f10df