summaryrefslogtreecommitdiff
path: root/builtin/reset.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-10-17 20:25:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-10-17 20:25:22 (GMT)
commitad0e95980c10237726724a4970bfca13ef7d73cb (patch)
tree4e56add8d73324edb1010dd310463adaa5276c2c /builtin/reset.c
parent5b4c45af0cb5cea7b26e2fb5464038f7663f5800 (diff)
parent641c900b2c3a8c3d385eb353b3801a5f49ddbb47 (diff)
downloadgit-ad0e95980c10237726724a4970bfca13ef7d73cb.zip
git-ad0e95980c10237726724a4970bfca13ef7d73cb.tar.gz
git-ad0e95980c10237726724a4970bfca13ef7d73cb.tar.bz2
Merge branch 'js/reset-usage'
* js/reset-usage: reset: fix usage
Diffstat (limited to 'builtin/reset.c')
-rw-r--r--builtin/reset.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/reset.c b/builtin/reset.c
index 5aa8607..c04ac07 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
};