Autogenerated HTML docs for v1.6.0.1-90-g27a6e

diff --git a/RelNotes-1.6.0.1.txt b/RelNotes-1.6.0.1.txt
index bac117e89d5553710d203a2c5adfb12a67962ff2..49d7a1cafabd129e392b48b85a9641b7f5ddb828 100644 (file)
--- a/RelNotes-1.6.0.1.txt
+++ b/RelNotes-1.6.0.1.txt
@@ -4,6 +4,9 @@ GIT v1.6.0.1 Release Notes
 Fixes since v1.6.0
 ------------------
 
+* "git diff --cc" did not honor content mangling specified by
+  gitattributes and core.autocrlf when reading from the work tree.
+
 * "git diff --check" incorrectly detected new trailing blank lines when
   whitespace check was in effect.
 
@@ -13,6 +16,8 @@ Fixes since v1.6.0
 * "git format-patch" peeked before the beginning of a string when
   "format.headers" variable is empty (a misconfiguration).
 
+* "git help help" did not work correctly.
+
 * "git mailinfo" (hence "git am") was unhappy when MIME multipart message
   contained garbage after the finishing boundary.
 
@@ -22,10 +27,10 @@ Fixes since v1.6.0
 * "git merge" did not refresh the index correctly when a merge resulted in
   a fast-forward.
 
-Contains other various documentation fixes.
+* "git merge" did not resolve a truly trivial merges that can be done
+  without content level merges.
 
---
-exec >/var/tmp/1
-O=v1.6.0-14-g3a634dc
-echo O=$(git describe maint)
-git shortlog --no-merges $O..maint
+* "git svn dcommit" to a repository with URL that has embedded usernames
+  did not work correctly.
+
+Contains other various documentation fixes.

diff --git a/config.txt b/config.txt
index 9020675866e6af6252b83d7df0bb8bc78249f4a6..af57d943049d5cf39b9681004cb0c7fd30a70c94 100644 (file)
--- a/config.txt
+++ b/config.txt
@@ -358,8 +358,13 @@ core.editor::
        `EDITOR` environment variables and then finally `vi`.
 
 core.pager::
-       The command that git will use to paginate output.  Can be overridden
-       with the `GIT_PAGER` environment variable.
+       The command that git will use to paginate output.  Can
+       be overridden with the `GIT_PAGER` environment
+       variable.  Note that git sets the `LESS` environment
+       variable to `FRSX` if it is unset when it runs the
+       pager.  One can change these settings by setting the
+       `LESS` variable to some other value or by giving the
+       `core.pager` option a value such as "`less -+FRSX`".
 
 core.whitespace::
        A comma separated list of common whitespace problems to
@@ -983,9 +988,11 @@ pack.packSizeLimit::
        linkgit:git-repack[1].
 
 pager.<cmd>::
-       Allows to set your own pager preferences for each command, overriding
-       the default. If `\--pager` or `\--no-pager` is specified on the command
-       line, it takes precedence over this option.
+       Allows turning on or off pagination of the output of a
+       particular git subcommand when writing to a tty.  If
+       `\--paginate` or `\--no-pager` is specified on the command line,
+       it takes precedence over this option.  To disable pagination for
+       all commands, set `core.pager` or 'GIT_PAGER' to "`cat`".
 
 pull.octopus::
        The default merge strategy to use when pulling multiple branches

diff --git a/git-config.html b/git-config.html
index 76fe6f1718e9db0802c6e819f4b3dac6861b73e0..a70c1a25cabcf2165eed234fda0b576bff538715 100644 (file)
--- a/git-config.html
+++ b/git-config.html
@@ -1198,8 +1198,13 @@ core.pager
 </dt>\r
 <dd>\r
 <p>\r
-        The command that git will use to paginate output.  Can be overridden\r
-        with the <tt>GIT_PAGER</tt> environment variable.\r
+        The command that git will use to paginate output.  Can\r
+        be overridden with the <tt>GIT_PAGER</tt> environment\r
+        variable.  Note that git sets the <tt>LESS</tt> environment\r
+        variable to <tt>FRSX</tt> if it is unset when it runs the\r
+        pager.  One can change these settings by setting the\r
+        <tt>LESS</tt> variable to some other value or by giving the\r
+        <tt>core.pager</tt> option a value such as "<tt>less -+FRSX</tt>".\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -2397,9 +2402,11 @@ pager.&lt;cmd&gt;
 </dt>\r
 <dd>\r
 <p>\r
-        Allows to set your own pager preferences for each command, overriding\r
-        the default. If <tt>--pager</tt> or <tt>--no-pager</tt> is specified on the command\r
-        line, it takes precedence over this option.\r
+        Allows turning on or off pagination of the output of a\r
+        particular git subcommand when writing to a tty.  If\r
+        <tt>--paginate</tt> or <tt>--no-pager</tt> is specified on the command line,\r
+        it takes precedence over this option.  To disable pagination for\r
+        all commands, set <tt>core.pager</tt> or <em>GIT_PAGER</em> to "<tt>cat</tt>".\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -2719,7 +2726,7 @@ web.browser
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 2008-08-20 09:13:27 UTC\r
+Last updated 2008-08-25 00:33:14 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git.html b/git.html
index b327e15b8a9f15b2f5622e0d0d0d97be81ef360a..970f457013567b7e8ff9a3d84e37741e7ee8b971 100644 (file)
--- a/git.html
+++ b/git.html
@@ -1878,7 +1878,8 @@ parameter, &lt;path&gt;.</p></div>
 <p>\r
         This environment variable overrides <tt>$PAGER</tt>. If it is set\r
         to an empty string or to the value "cat", git will not launch\r
-        a pager.\r
+        a pager.  See also the <tt>core.pager</tt> option in\r
+        <a href="git-config.html">git-config(1)</a>.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -2024,7 +2025,7 @@ contributors on the git-list &lt;git@vger.kernel.org&gt;.</p></div>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 2008-08-20 09:13:33 UTC\r
+Last updated 2008-08-25 00:33:14 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git.txt b/git.txt
index 1bc295dd547b5375fb7c915efbc91de9130aea2c..e178fb581323adaa5f490fb67732f98147ec460f 100644 (file)
--- a/git.txt
+++ b/git.txt
@@ -43,9 +43,10 @@ unreleased) version of git, that is available from 'master'
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 
-* link:v1.6.0/git.html[documentation for release 1.6.0]
+* link:v1.6.1/git.html[documentation for release 1.6.1]
 
 * release notes for
+  link:RelNotes-1.6.1.txt[1.6.1],
   link:RelNotes-1.6.0.txt[1.6.0].
 
 * link:v1.5.6.5/git.html[documentation for release 1.5.6.5]
@@ -497,7 +498,8 @@ other
 'GIT_PAGER'::
        This environment variable overrides `$PAGER`. If it is set
        to an empty string or to the value "cat", git will not launch
-       a pager.
+       a pager.  See also the `core.pager` option in
+       linkgit:git-config[1].
 
 'GIT_SSH'::
        If this environment variable is set then 'git-fetch'