Merge branch 'js/reset-usage' into maint

Message fix-up. * js/reset-usage: reset: fix usage
2016-10-28 09:01:22 -07:00 · 2016-10-28 09:01:22 -07:00 · 9a82d8fd0b
parent 311811b39f 641c900b2c
commit 9a82d8fd0b
1 changed files with 1 additions and 1 deletions
--- 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
 };