![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 18 Sep 2010 21:46:44 +0000 (14:46 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 18 Sep 2010 21:46:44 +0000 (14:46 -0700) | ||
| commit | 1125297ca1744be09f9e392aab0dd2c70d838583 | |
| tree | ac3bb72ed41bf015cebb23a9d9ee010b803b8ec8 | tree | snapshot |
| parent | 14d872987a270f383e20dc183f4a960cca0f0f36 | commit | diff |
| parent | 4c608520ed58301de99024e47a0579b058db0a65 | commit | diff |
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
* 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 | diff1 | | diff2 | | blob | history |