From 3901ffb453101d619d2d19f531d2d05481a03751 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 26 Jun 2006 23:46:53 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.4.1-rc1-g1ef9 --- git-grep.html | 14 ++++++++++++-- git-grep.txt | 7 ++++++- git-merge.html | 18 ++++++++++++++++-- git-pull.html | 16 +++++++++++++++- git-rebase.html | 3 +-- git-rebase.txt | 1 - merge-options.txt | 8 ++++++++ 7 files changed, 58 insertions(+), 9 deletions(-) diff --git a/git-grep.html b/git-grep.html index db8b1727a..21c53b7ff 100644 --- a/git-grep.html +++ b/git-grep.html @@ -280,7 +280,7 @@ git-grep(1) Manual Page [-n] [-l | --files-with-matches] [-L | --files-without-match] [-c | --count] [-A <post-context>] [-B <pre-context>] [-C <context>] - [-f <file>] [-e <pattern>] + [-f <file>] [-e] <pattern> [<tree>…] [--] [<path>…] @@ -391,6 +391,16 @@ registered in the index file, or given tree objects.

+-e +
+
+

+ The next parameter is the pattern. This option has to be + used for patterns starting with - and should be used in + scripts passing user input to grep. +

+
+
<tree>…
@@ -424,7 +434,7 @@ revamped by Junio C Hamano.

diff --git a/git-grep.txt b/git-grep.txt index 7b810dfda..62a8e7f22 100644 --- a/git-grep.txt +++ b/git-grep.txt @@ -16,7 +16,7 @@ SYNOPSIS [-n] [-l | --files-with-matches] [-L | --files-without-match] [-c | --count] [-A ] [-B ] [-C ] - [-f ] [-e ] + [-f ] [-e] [...] [--] [...] @@ -71,6 +71,11 @@ OPTIONS -f :: Read patterns from , one per line. +-e:: + The next parameter is the pattern. This option has to be + used for patterns starting with - and should be used in + scripts passing user input to grep. + `...`:: Search blobs in the trees for specified patterns. diff --git a/git-merge.html b/git-merge.html index 2311b9e25..45a341fa8 100644 --- a/git-merge.html +++ b/git-merge.html @@ -3,7 +3,7 @@ - +