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