Merge fixes up to GIT 1.1.2

diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index 5f082167c1b55f1606f0a9ff48db0e03d10faa7b..2bfd8edbc8e8e95a83b4ceca8b05faee3edcd9ad 100644 (file)
--- a/Documentation/git-grep.txt
+++ b/Documentation/git-grep.txt
@@ -1,6 +1,5 @@
 git-grep(1)
 ===========
-v0.99.6, Sep 2005
 
 NAME
 ----
@@ -9,7 +8,7 @@ git-grep - print lines matching a pattern
 
 SYNOPSIS
 --------
-'git-grep' <option>... <pattern> <path>...
+'git-grep' [<option>...] <pattern> [<path>...]
 
 DESCRIPTION
 -----------
@@ -28,7 +27,6 @@ OPTIONS
        The pattern to look for.
 
 <path>...::
-
        Optional paths to limit the set of files to be searched;
        passed to `git-ls-files`.