diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-10-28 16:01:22 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-28 16:01:22 (GMT) |
| commit | 9a82d8fd0b778664c5178b27b17a5dbbac5e9d21 (patch) | |
| tree | a7ec5ec3783b4039da3a5049f47488516cc22d3b /builtin | |
| parent | 311811b39ff3e0f7035e09ec45f992f10beaaa56 (diff) | |
| parent | 641c900b2c3a8c3d385eb353b3801a5f49ddbb47 (diff) | |
| download | git-9a82d8fd0b778664c5178b27b17a5dbbac5e9d21.zip git-9a82d8fd0b778664c5178b27b17a5dbbac5e9d21.tar.gz git-9a82d8fd0b778664c5178b27b17a5dbbac5e9d21.tar.bz2 | |
Merge branch 'js/reset-usage' into maint
Message fix-up.
* js/reset-usage:
reset: fix usage
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/reset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/reset.c b/builtin/reset.c index 9020ec6..9400acc 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 }; |