summaryrefslogtreecommitdiff
path: root/Documentation/git-ls-files.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-01-05 20:54:42 -0800
committerJunio C Hamano <junkio@cox.net>2006-01-05 20:54:42 -0800
commit5df466c507ee2dd81c2e9002c3fedf3536cde0dc (patch)
tree92fff315690007bbbdaa9116570a8a49b01f5420 /Documentation/git-ls-files.txt
parent58e3fb40f7ca1c28f9105c15166884f80bb22e55 (diff)
parent92e802c6ccb96d1b5e8561b0a136d43d82253293 (diff)
downloadgit-5df466c507ee2dd81c2e9002c3fedf3536cde0dc.tar.gz
Merge fixes up to GIT 1.0.7
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-ls-files.txt')
-rw-r--r--Documentation/git-ls-files.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index 186f3bb57a..e42af5ebe2 100644
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -74,7 +74,7 @@ OPTIONS
H:: cached
M:: unmerged
R:: removed/deleted
- C:: modifed/changed
+ C:: modified/changed
K:: to be killed
? other