From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 31 Mar 2010 22:14:27 +0000 (-0700)
Subject: Sync with 1.7.0.4
X-Git-Tag: v1.7.1-rc0~33
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=890a13a45285ad44858add2ce2f74eb478f549c8;p=git.git

Sync with 1.7.0.4

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

890a13a45285ad44858add2ce2f74eb478f549c8
diff --cc builtin/reset.c
index 2c3a69adc,a174a3161..1283068fd
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@@ -22,8 -22,9 +22,9 @@@
  #include "cache-tree.h"
  
  static const char * const git_reset_usage[] = {
 -	"git reset [--mixed | --soft | --hard | --merge] [-q] [<commit>]",
 +	"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
  };