Merge branch 'jc/color-attrs' into maint

diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
index c7aa444317855b5b1c00c15284a16fdd4c4cb3ad..168db08627e009c8d760bae36a4344d433923632 100644 (file)
--- a/Documentation/git-reset.txt
+++ b/Documentation/git-reset.txt
@@ -39,7 +39,7 @@ OPTIONS
 --soft::
        Does not touch the index file nor the working tree at all, but
        requires them to be in a good order. This leaves all your changed
-       files "Changes to be committed", as 'git-status' would
+       files "Changes to be committed", as 'git status' would
        put it.
 
 --hard::