Sync with 1.7.0.4

Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-03-31 15:14:27 -07:00
parent 87b3c0117a 2be10bb5c1
commit 890a13a452
11 changed files with 51 additions and 17 deletions
--- 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
 };