diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-10-08 04:06:21 +0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-10-08 04:06:21 +0400 |
| commit | 0d0b7c237af0846123bef73879d65a3e78a56461 (patch) | |
| tree | 274542bcbc891cca353c2728ac4075df3d1d2c0d /Documentation | |
| parent | d1c5f2a42d7b5c0e3d3862212dea1f09809c4963 (diff) | |
| parent | 33bb218e9d7299f6ed06177c65d357ec81954ca9 (diff) | |
Merge branch 'fixes'
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-ls-files.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt index 940285f8c8..f4501d62cd 100644 --- a/Documentation/git-ls-files.txt +++ b/Documentation/git-ls-files.txt @@ -50,7 +50,7 @@ OPTIONS -k|--killed:: Show files on the filesystem that need to be removed due - to file/directory conflicts for checkout-cache to + to file/directory conflicts for checkout-index to succeed. -z:: |