Merge branch 'po/doc-assume-unchanged'
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Dec 2014 20:27:38 +0000 (12:27 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Dec 2014 20:27:38 +0000 (12:27 -0800)
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

1  2 
Documentation/git-update-index.txt
Documentation/gitignore.txt
Simple merge
Simple merge