tree ac3bb72ed41bf015cebb23a9d9ee010b803b8ec8
parent 14d872987a270f383e20dc183f4a960cca0f0f36
parent 4c608520ed58301de99024e47a0579b058db0a65
author Junio C Hamano <gitster@pobox.com> 1284846404 -0700
committer Junio C Hamano <gitster@pobox.com> 1284846404 -0700

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