From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 21 Jul 2008 00:16:29 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.0-rc0~7
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fa4946b5532ff911565c882892a715616c22cdec;p=git.git

Merge branch 'maint'

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

Conflicts:
	builtin-grep.c
---

fa4946b5532ff911565c882892a715616c22cdec
diff --cc builtin-grep.c
index 7bf6a7156,d8b06ce81..631129ddf
--- a/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";