From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 28 Oct 2016 16:01:22 +0000 (-0700)
Subject: Merge branch 'js/reset-usage' into maint
X-Git-Tag: v2.10.2~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9a82d8fd0b778664c5178b27b17a5dbbac5e9d21?hp=311811b39ff3e0f7035e09ec45f992f10beaaa56

Merge branch 'js/reset-usage' into maint

Message fix-up.

* js/reset-usage:
reset: fix usage
---

diff --git a/builtin/reset.c b/builtin/reset.c
index 9020ec66c8..9400acce07 100644
--- 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
 };