Merge branch 'mm/clean-doc-fix' into maint
commit924459c51604e34d5e392963550111bede4d9f03
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Feb 2016 21:10:20 +0000 (22 13:10 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Feb 2016 21:10:20 +0000 (22 13:10 -0800)
tree95558bb1640f75bcf0ed8646ae7886a34b8c72e5
parent2263a05907a1dd8d402790b578573238ab2abd9a
parent31e3c2d7f83bc8bcb9b83d08a3bfb75e5b245e36
Merge branch 'mm/clean-doc-fix' into maint

The documentation for "git clean" has been corrected; it mentioned
that .git/modules/* are removed by giving two "-f", which has never
been the case.

* mm/clean-doc-fix:
  Documentation/git-clean.txt: don't mention deletion of .git/modules/*