Merge branch 'jk/readme-gmane-is-no-more' into maint

diff --git a/builtin/reset.c b/builtin/reset.c
index 5aa86079d3af8e37a084653845b1fed8d3db6b83..c04ac076dc53b99039768dcdcbf2861e285896c2 100644 (file)
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -24,7 +24,7 @@
 
 static const char * const git_reset_usage[] = {
        N_("git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"),
-       N_("git reset [-q] <tree-ish> [--] <paths>..."),
+       N_("git reset [-q] [<tree-ish>] [--] <paths>..."),
        N_("git reset --patch [<tree-ish>] [--] [<paths>...]"),
        NULL
 };