Sync with 1.7.0.4

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

diff --cc Makefile
Simple merge

diff --cc builtin/reset.c
index 2c3a69adc674bb3f539d29b2d29116e89f887066,a174a316102c6ed40b4cef24d7812220f6ac5d89..1283068fd24c371e39f0271d01dd6b3aac437d4b
--- 1/builtin/reset.c
--- 2/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
  };
  

diff --cc compat/mingw.c
Simple merge

diff --cc diff.c
Simple merge

diff --cc gitweb/gitweb.perl
Simple merge