Merge branch 'maint'

* maint:
fix usage string for git grep
refresh-index: fix bitmask assignment

Conflicts:
builtin-grep.c

diff --cc builtin-grep.c
index 7bf6a7156cdd8e236d451b9be4d4754c2c517e66,d8b06ce810d334654ada4b7fa3b79c19a4787565..631129ddfd0ffe06f919882d22cfc494d9553f50
--- 1/builtin-grep.c
--- 2/builtin-grep.c
+++ b/builtin-grep.c
@@@ -498,7 -498,7 +498,7 @@@ static int grep_object(struct grep_opt 
  }
  
  static const char builtin_grep_usage[] =
- "git grep <option>* <rev>* [-e] <pattern> [<path>...]";
 -"git-grep <option>* [-e] <pattern> <rev>* [[--] <path>...]";
++"git grep <option>* [-e] <pattern> <rev>* [[--] <path>...]";
  
  static const char emsg_invalid_context_len[] =
  "%s: invalid context length argument";

diff --cc cache.h
Simple merge