Code

Merge branch 'js/ls-files-x-doc'
authorJunio C Hamano <gitster@pobox.com>
Sat, 18 Sep 2010 21:46:44 +0000 (14:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 18 Sep 2010 21:46:44 +0000 (14:46 -0700)
commit1125297ca1744be09f9e392aab0dd2c70d838583
treeac3bb72ed41bf015cebb23a9d9ee010b803b8ec8
parent14d872987a270f383e20dc183f4a960cca0f0f36
parent4c608520ed58301de99024e47a0579b058db0a65
Merge branch 'js/ls-files-x-doc'

* js/ls-files-x-doc:
  ls-files documentation: reword for consistency
  git-ls-files.txt: clarify -x/--exclude option

Conflicts:
Documentation/git-ls-files.txt
Documentation/git-ls-files.txt