Autogenerated HTML docs for v1.4.2-g182a

diff --git a/diff-options.txt b/diff-options.txt
index 47ba9a403ae9379b87c54f0103297da9157237cb..b5d9763594b3fcb4dcc273c0118f7edbf236380d 100644 (file)
--- 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 45c2f940b68ad2efa70482d4c331564f0f36cf3e..b46509adae642bbabebe1e3ad871c032b1dffb0b 100644 (file)
--- a/git-diff-files.html
+++ b/git-diff-files.html
@@ -383,6 +383,14 @@ same as "git-diff-index" and "git-diff-tree".</p>
 </p>\r
 </dd>\r
 <dt>\r
+--color-words\r
+</dt>\r
+<dd>\r
+<p>\r
+        Show colored word diff, i.e. color words which have changed.\r
+</p>\r
+</dd>\r
+<dt>\r
 --no-renames\r
 </dt>\r
 <dd>\r
@@ -906,7 +914,7 @@ two unresolved merge parents with the working tree file
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:41 UTC\r
+Last updated 13-Aug-2006 07:47:28 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-index.html b/git-diff-index.html
index 7548db1c51aae28504d93e57b8d8079bbdb5466d..0af0e250cbd1e0229761cabaae32cca60abce834 100644 (file)
--- a/git-diff-index.html
+++ b/git-diff-index.html
@@ -384,6 +384,14 @@ entries in the index are compared.</p>
 </p>\r
 </dd>\r
 <dt>\r
+--color-words\r
+</dt>\r
+<dd>\r
+<p>\r
+        Show colored word diff, i.e. color words which have changed.\r
+</p>\r
+</dd>\r
+<dt>\r
 --no-renames\r
 </dt>\r
 <dd>\r
@@ -996,7 +1004,7 @@ always have the special all-zero sha1.</td>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:42 UTC\r
+Last updated 13-Aug-2006 07:47:29 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-stages.html b/git-diff-stages.html
index 00e74a3f545eed8db9488654d88170565b70e20f..6c984294454a80f34f4f857f1cc25a8b0f06884c 100644 (file)
--- a/git-diff-stages.html
+++ b/git-diff-stages.html
@@ -381,6 +381,14 @@ unmerged index file.</p>
 </p>\r
 </dd>\r
 <dt>\r
+--color-words\r
+</dt>\r
+<dd>\r
+<p>\r
+        Show colored word diff, i.e. color words which have changed.\r
+</p>\r
+</dd>\r
+<dt>\r
 --no-renames\r
 </dt>\r
 <dd>\r
@@ -880,7 +888,7 @@ two unresolved merge parents with the working tree file
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:43 UTC\r
+Last updated 13-Aug-2006 07:47:30 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-tree.html b/git-diff-tree.html
index aa2c4839bb7226d27648bd14564eba3dfef925b5..446a961a69f5aa67f428fc87698246010092b80c 100644 (file)
--- a/git-diff-tree.html
+++ b/git-diff-tree.html
@@ -386,6 +386,14 @@ git-diff-tree(1) Manual Page
 </p>\r
 </dd>\r
 <dt>\r
+--color-words\r
+</dt>\r
+<dd>\r
+<p>\r
+        Show colored word diff, i.e. color words which have changed.\r
+</p>\r
+</dd>\r
+<dt>\r
 --no-renames\r
 </dt>\r
 <dd>\r
@@ -1068,7 +1076,7 @@ two unresolved merge parents with the working tree file
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:44 UTC\r
+Last updated 13-Aug-2006 07:47:31 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-grep.html b/git-grep.html
index 386db3b0016a04f19f294c920df1b5c3efd1f12d..ead34076955fd3af6f262ebb9d482ea81d84e224 100644 (file)
--- a/git-grep.html
+++ b/git-grep.html
@@ -275,7 +275,7 @@ git-grep(1) Manual Page
 <div class="verseblock">\r
 <div class="content"><em>git-grep</em> [--cached]\r
            [-a | --text] [-I] [-i | --ignore-case] [-w | --word-regexp]\r
-           [-v | --invert-match]\r
+           [-v | --invert-match] [--full-name]\r
            [-E | --extended-regexp] [-G | --basic-regexp] [-F | --fixed-strings]\r
            [-n] [-l | --files-with-matches] [-L | --files-without-match]\r
            [-c | --count]\r
@@ -337,6 +337,17 @@ registered in the index file, or given tree objects.</p>
 </p>\r
 </dd>\r
 <dt>\r
+--full-name\r
+</dt>\r
+<dd>\r
+<p>\r
+        When run from a subdirectory, the command usually\r
+        outputs paths relative to the current directory.  This\r
+        option forces paths to be output relative to the project\r
+        top directory.\r
+</p>\r
+</dd>\r
+<dt>\r
 -E | --extended-regexp | -G | --basic-regexp\r
 </dt>\r
 <dd>\r
@@ -460,7 +471,7 @@ revamped by Junio C Hamano.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 03-Aug-2006 00:29:31 UTC\r
+Last updated 13-Aug-2006 07:47:32 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-grep.txt b/git-grep.txt
index dc7683383c3b4dc4c6bede834155ae56132aafc3..7545dd9a3e6c3cc16fd46e44830af4767978d2be 100644 (file)
--- 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 e26dfe2fad271a0e1c430dcb026f2b9e1aacf7b3..8e6a00035951d1bd973c525eddb988d8598418f1 100644 (file)
--- a/git.html
+++ b/git.html
@@ -1595,6 +1595,14 @@ git so take care if using Cogito etc.</p>
 <h3>other</h3>\r
 <dl>\r
 <dt>\r
+<em>GIT_PAGER</em>\r
+</dt>\r
+<dd>\r
+<p>\r
+        This environment variable overrides <tt>$PAGER</tt>.\r
+</p>\r
+</dd>\r
+<dt>\r
 <em>GIT_TRACE</em>\r
 </dt>\r
 <dd>\r
@@ -2160,7 +2168,7 @@ contributors on the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 04-Aug-2006 00:17:44 UTC\r
+Last updated 13-Aug-2006 07:47:32 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git.txt b/git.txt
index bcf187a11cfaf754ecb93a2210139dd88f6a9d32..3de5fa9c82de4d49a041480ce6681f69a97f167c 100644 (file)
--- 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