From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 22 Dec 2014 20:27:38 +0000 (-0800)
Subject: Merge branch 'po/doc-assume-unchanged'
X-Git-Tag: v2.3.0-rc0~50
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/14d4aab3bbd4cb25a4ccd16dc778c4c6c0a77c73

Merge branch 'po/doc-assume-unchanged'

Fixes long-standing misunderstanding of what assume-unchanged is
about.  Some text near what is removed by the bottom patch may also
have to be removed.

* po/doc-assume-unchanged:
gitignore.txt: do not suggest assume-unchanged
doc: make clear --assume-unchanged's user contract
---

14d4aab3bbd4cb25a4ccd16dc778c4c6c0a77c73