Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'js/reset-usage' into maint
author
Junio C Hamano
<gitster@pobox.com>
Fri, 28 Oct 2016 16:01:22 +0000
(09:01 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 28 Oct 2016 16:01:22 +0000
(09:01 -0700)
Message fix-up.
* js/reset-usage:
reset: fix usage
builtin/reset.c
patch
|
blob
|
history
raw
(from parent 1:
311811b
)
diff --git
a/builtin/reset.c
b/builtin/reset.c
index 9020ec66c81de0185244d478e588d4a05c2a4f1d..9400acce070c8870d6aab8b9a4cb361460488fb6 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
};