From: Junio C Hamano Date: Sun, 13 Aug 2006 07:47:41 +0000 (+0000) Subject: Autogenerated HTML docs for v1.4.2-g182a X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=85e45faa44326e78d2c67d0bddffa59e98b1e8e7;p=git.git Autogenerated HTML docs for v1.4.2-g182a --- diff --git a/diff-options.txt b/diff-options.txt index 47ba9a403..b5d976359 100644 --- a/diff-options.txt +++ b/diff-options.txt @@ -36,6 +36,9 @@ Turn off colored diff, even when the configuration file gives the default to color output. +--color-words:: + Show colored word diff, i.e. color words which have changed. + --no-renames:: Turn off rename detection, even when the configuration file gives the default to do so. diff --git a/git-diff-files.html b/git-diff-files.html index 45c2f940b..b46509ada 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -383,6 +383,14 @@ same as "git-diff-index" and "git-diff-tree".

+--color-words +
+
+

+ Show colored word diff, i.e. color words which have changed. +

+
+
--no-renames
@@ -906,7 +914,7 @@ two unresolved merge parents with the working tree file diff --git a/git-diff-index.html b/git-diff-index.html index 7548db1c5..0af0e250c 100644 --- a/git-diff-index.html +++ b/git-diff-index.html @@ -384,6 +384,14 @@ entries in the index are compared.

+--color-words +
+
+

+ Show colored word diff, i.e. color words which have changed. +

+
+
--no-renames
@@ -996,7 +1004,7 @@ always have the special all-zero sha1. diff --git a/git-diff-stages.html b/git-diff-stages.html index 00e74a3f5..6c9842944 100644 --- a/git-diff-stages.html +++ b/git-diff-stages.html @@ -381,6 +381,14 @@ unmerged index file.

+--color-words +
+
+

+ Show colored word diff, i.e. color words which have changed. +

+
+
--no-renames
@@ -880,7 +888,7 @@ two unresolved merge parents with the working tree file diff --git a/git-diff-tree.html b/git-diff-tree.html index aa2c4839b..446a961a6 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -386,6 +386,14 @@ git-diff-tree(1) Manual Page

+--color-words +
+
+

+ Show colored word diff, i.e. color words which have changed. +

+
+
--no-renames
@@ -1068,7 +1076,7 @@ two unresolved merge parents with the working tree file diff --git a/git-grep.html b/git-grep.html index 386db3b00..ead340769 100644 --- a/git-grep.html +++ b/git-grep.html @@ -275,7 +275,7 @@ git-grep(1) Manual Page
git-grep [--cached] [-a | --text] [-I] [-i | --ignore-case] [-w | --word-regexp] - [-v | --invert-match] + [-v | --invert-match] [--full-name] [-E | --extended-regexp] [-G | --basic-regexp] [-F | --fixed-strings] [-n] [-l | --files-with-matches] [-L | --files-without-match] [-c | --count] @@ -337,6 +337,17 @@ registered in the index file, or given tree objects.

+--full-name +
+
+

+ When run from a subdirectory, the command usually + outputs paths relative to the current directory. This + option forces paths to be output relative to the project + top directory. +

+
+
-E | --extended-regexp | -G | --basic-regexp
@@ -460,7 +471,7 @@ revamped by Junio C Hamano.

diff --git a/git-grep.txt b/git-grep.txt index dc7683383..7545dd9a3 100644 --- a/git-grep.txt +++ b/git-grep.txt @@ -11,7 +11,7 @@ SYNOPSIS [verse] 'git-grep' [--cached] [-a | --text] [-I] [-i | --ignore-case] [-w | --word-regexp] - [-v | --invert-match] + [-v | --invert-match] [--full-name] [-E | --extended-regexp] [-G | --basic-regexp] [-F | --fixed-strings] [-n] [-l | --files-with-matches] [-L | --files-without-match] [-c | --count] @@ -47,6 +47,12 @@ OPTIONS -v | --invert-match:: Select non-matching lines. +--full-name:: + When run from a subdirectory, the command usually + outputs paths relative to the current directory. This + option forces paths to be output relative to the project + top directory. + -E | --extended-regexp | -G | --basic-regexp:: Use POSIX extended/basic regexp for patterns. Default is to use basic regexp. diff --git a/git.html b/git.html index e26dfe2fa..8e6a00035 100644 --- a/git.html +++ b/git.html @@ -1595,6 +1595,14 @@ git so take care if using Cogito etc.

other

+GIT_PAGER +
+
+

+ This environment variable overrides $PAGER. +

+
+
GIT_TRACE
@@ -2160,7 +2168,7 @@ contributors on the git-list <git@vger.kernel.org>.

diff --git a/git.txt b/git.txt index bcf187a11..3de5fa9c8 100644 --- a/git.txt +++ b/git.txt @@ -633,6 +633,9 @@ git Diffs other ~~~~~ +'GIT_PAGER':: + This environment variable overrides `$PAGER`. + 'GIT_TRACE':: If this variable is set git will print `trace:` messages on stderr telling about alias expansion, built-in command