summaryrefslogtreecommitdiff
path: root/builtin/reset.c
diff options
context:
space:
mode:
authorMartin von Zweigbergk <martinvonz@gmail.com>2013-01-16 18:00:35 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-01-16 20:50:23 (GMT)
commitbf44142f5464e913d99f9544787e59fc630f6cc9 (patch)
tree867749476b1de07664708018e464b50850907b95 /builtin/reset.c
parent3fde386a40f38dbaa684c17603e71909b862d021 (diff)
downloadgit-bf44142f5464e913d99f9544787e59fc630f6cc9.zip
git-bf44142f5464e913d99f9544787e59fc630f6cc9.tar.gz
git-bf44142f5464e913d99f9544787e59fc630f6cc9.tar.bz2
reset: update documentation to require only tree-ish with paths
When resetting with paths, we no longer require a commit argument, but only a tree-ish. Update the documentation and synopsis accordingly. Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/reset.c')
-rw-r--r--builtin/reset.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/reset.c b/builtin/reset.c
index 921afbe..6032131 100644
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -23,8 +23,8 @@
static const char * const git_reset_usage[] = {
N_("git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"),
- N_("git reset [-q] <commit> [--] <paths>..."),
- N_("git reset --patch [<commit>] [--] [<paths>...]"),
+ N_("git reset [-q] <tree-ish> [--] <paths>..."),
+ N_("git reset --patch [<tree-ish>] [--] [<paths>...]"),
NULL
};