diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-03-31 15:14:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-31 15:14:27 -0700 |
| commit | 890a13a45285ad44858add2ce2f74eb478f549c8 (patch) | |
| tree | 778d3d73aef0d238edd621eaaf38dcdb9f22616e /builtin | |
| parent | Merge branch 'maint' (diff) | |
| parent | Git 1.7.0.4 (diff) | |
| download | tgif-890a13a45285ad44858add2ce2f74eb478f549c8.tar.xz | |
Sync with 1.7.0.4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/reset.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/reset.c b/builtin/reset.c index 2c3a69adc6..1283068fd2 100644 --- a/builtin/reset.c +++ b/builtin/reset.c @@ -23,7 +23,8 @@ static const char * const git_reset_usage[] = { "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]", - "git reset [--mixed] <commit> [--] <paths>...", + "git reset [-q] <commit> [--] <paths>...", + "git reset --patch [<commit>] [--] [<paths>...]", NULL }; |