summaryrefslogtreecommitdiff
path: root/builtin/reset.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-03-31 22:14:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-03-31 22:14:27 (GMT)
commit890a13a45285ad44858add2ce2f74eb478f549c8 (patch)
tree778d3d73aef0d238edd621eaaf38dcdb9f22616e /builtin/reset.c
parent87b3c0117a340df61bdbac6794611c74696bd42a (diff)
parent2be10bb5c1cfe15aa4f1b43137ccd17d826d8553 (diff)
downloadgit-890a13a45285ad44858add2ce2f74eb478f549c8.zip
git-890a13a45285ad44858add2ce2f74eb478f549c8.tar.gz
git-890a13a45285ad44858add2ce2f74eb478f549c8.tar.bz2
Sync with 1.7.0.4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/reset.c')
-rw-r--r--builtin/reset.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/reset.c b/builtin/reset.c
index 2c3a69a..1283068 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
};