Autogenerated HTML docs for v1.5.3.5-474-g3e4bb

diff --git a/RelNotes-1.5.3.5.txt b/RelNotes-1.5.3.5.txt
index bf6a279ede10ac88544058d010101a8b0052694e..4e46d2c2a27cecee0d87461ad08b31cea5dfec2e 100644 (file)
--- a/RelNotes-1.5.3.5.txt
+++ b/RelNotes-1.5.3.5.txt
@@ -92,9 +92,3 @@ Fixes since v1.5.3.4
 
  * "git-rebase -interactive" did not handle its "--strategy" option
    properly.
-
---
-exec >/var/tmp/1
-O=v1.5.3.4-65-gf91333d
-echo O=`git describe refs/heads/maint`
-git shortlog --no-merges $O..refs/heads/maint

diff --git a/git-clone.html b/git-clone.html
index 24c834419e116576ef0e9ed0e2fb2c534e1e50f5..5305119f2dbb5fe08fdb55d4044a9676e5f1e59a 100644 (file)
--- a/git-clone.html
+++ b/git-clone.html
@@ -438,11 +438,11 @@ configuration variables.</p>
 <dd>\r
 <p>\r
         Create a <em>shallow</em> clone with a history truncated to the\r
-        specified number of revs.  A shallow repository has\r
+        specified number of revisions.  A shallow repository has a\r
         number of limitations (you cannot clone or fetch from\r
         it, nor push from nor into it), but is adequate if you\r
-        want to only look at near the tip of a large project\r
-        with a long history, and would want to send in a fixes\r
+        are only interested in the recent history of a large project\r
+        with a long history, and would want to send in fixes\r
         as patches.\r
 </p>\r
 </dd>\r
@@ -641,7 +641,7 @@ Create a repository on the kernel.org machine that borrows from Linus
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 10-Sep-2007 01:32:39 UTC\r
+Last updated 02-Nov-2007 02:47:20 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-clone.txt b/git-clone.txt
index 253f4f03c532eb34912f1b5f570f3f6359692fb9..cca14d6b5df042fcf48889e5ff00285ffc4c3009 100644 (file)
--- a/git-clone.txt
+++ b/git-clone.txt
@@ -111,11 +111,11 @@ OPTIONS
 
 --depth <depth>::
        Create a 'shallow' clone with a history truncated to the
-       specified number of revs.  A shallow repository has
+       specified number of revisions.  A shallow repository has a
        number of limitations (you cannot clone or fetch from
        it, nor push from nor into it), but is adequate if you
-       want to only look at near the tip of a large project
-       with a long history, and would want to send in a fixes
+       are only interested in the recent history of a large project
+       with a long history, and would want to send in fixes
        as patches.
 
 <repository>::

diff --git a/git-filter-branch.html b/git-filter-branch.html
index 11fcd821ce8344306a9aba202a710403c6a91733..b601400b284dbf14df3299be06255388cb105385 100644 (file)
--- a/git-filter-branch.html
+++ b/git-filter-branch.html
@@ -523,7 +523,7 @@ git filter-branch $graft-id..HEAD</tt></pre>
                 git commit-tree "$@";\r
         fi' HEAD</tt></pre>\r
 </div></div>\r
-<p>The function <em>skip_commits</em> is defined as follows:</p>\r
+<p>The function <em>skip_commit</em> is defined as follows:</p>\r
 <div class="listingblock">\r
 <div class="content">\r
 <pre><tt>skip_commit()\r
@@ -593,7 +593,7 @@ and the git list &lt;git@vger.kernel.org&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 23-Oct-2007 01:21:48 UTC\r
+Last updated 02-Nov-2007 02:47:20 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-filter-branch.txt b/git-filter-branch.txt
index ba9b4fbca79321003f8cda6341d066f9ccc00349..385ecc900f2d7f4c982a96f1a97607334682e074 100644 (file)
--- a/git-filter-branch.txt
+++ b/git-filter-branch.txt
@@ -219,7 +219,7 @@ git filter-branch --commit-filter '
        fi' HEAD
 ------------------------------------------------------------------------------
 
-The function 'skip_commits' is defined as follows:
+The function 'skip_commit' is defined as follows:
 
 --------------------------
 skip_commit()

diff --git a/git-format-patch.html b/git-format-patch.html
index db3610165b5d09a6e1d4c03044f22c6139effa0b..f757ca77a5bd5cc5ada192fc3d9926bc094edb6d 100644 (file)
--- a/git-format-patch.html
+++ b/git-format-patch.html
@@ -932,7 +932,7 @@ git-format-patch --root origin
 </dt>\r
 <dd>\r
 <p>\r
-        Extract all commits which that leads to <em>origin</em> since the\r
+        Extract all commits that lead to <em>origin</em> since the\r
         inception of the project.\r
 </p>\r
 </dd>\r
@@ -979,7 +979,7 @@ git-format-patch -3
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 03-Oct-2007 12:03:48 UTC\r
+Last updated 02-Nov-2007 02:47:21 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-format-patch.txt b/git-format-patch.txt
index c9857a2d62e55edaf7e71c1a89ae09c8ae2423d2..f0617efa0ab5d6c046e2b880a710ab852f1afd6a 100644 (file)
--- a/git-format-patch.txt
+++ b/git-format-patch.txt
@@ -168,7 +168,7 @@ git-format-patch origin::
        is created in the current directory.
 
 git-format-patch \--root origin::
-       Extract all commits which that leads to 'origin' since the
+       Extract all commits that lead to 'origin' since the
        inception of the project.
 
 git-format-patch -M -B origin::

diff --git a/git-mergetool.html b/git-mergetool.html
index 80706dbca25c31a7b32f55548bf3851efb9d6e4e..d2a24b8e2d8d85ab175c2a97fe0effb4b97f7429 100644 (file)
--- a/git-mergetool.html
+++ b/git-mergetool.html
@@ -293,12 +293,17 @@ with merge conflicts.</p>
 <p>\r
         Use the merge resolution program specified by &lt;tool&gt;.\r
         Valid merge tools are:\r
-        kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, and opendiff\r
+        kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, and opendiff\r
 </p>\r
 <p>If a merge resolution program is not specified, <em>git mergetool</em>\r
 will use the configuration variable merge.tool.  If the\r
 configuration variable merge.tool is not set, <em>git mergetool</em>\r
 will pick a suitable default.</p>\r
+<p>You can explicitly provide a full path to the tool by setting the\r
+configuration variable mergetool.&lt;tool&gt;.path. For example, you\r
+can configure the absolute path to kdiff3 by setting\r
+mergetool.kdiff3.path. Otherwise, <em>git mergetool</em> assumes the tool\r
+is available in PATH.</p>\r
 </dd>\r
 </dl>\r
 </div>\r
@@ -316,7 +321,7 @@ will pick a suitable default.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:46 UTC\r
+Last updated 02-Nov-2007 02:47:21 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-mergetool.txt b/git-mergetool.txt
index 6c32c6d18ead2047ce590e2853bbc1a5a2dd1e7c..a26c260162cf6cbab922dfd6320b1d440d7090ca 100644 (file)
--- a/git-mergetool.txt
+++ b/git-mergetool.txt
@@ -25,12 +25,18 @@ OPTIONS
 -t or --tool=<tool>::
        Use the merge resolution program specified by <tool>.
        Valid merge tools are:
-       kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, and opendiff
+       kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, and opendiff
 +
 If a merge resolution program is not specified, 'git mergetool'
 will use the configuration variable merge.tool.  If the
 configuration variable merge.tool is not set, 'git mergetool'
 will pick a suitable default.
++
+You can explicitly provide a full path to the tool by setting the
+configuration variable mergetool.<tool>.path. For example, you
+can configure the absolute path to kdiff3 by setting
+mergetool.kdiff3.path. Otherwise, 'git mergetool' assumes the tool
+is available in PATH.
 
 Author
 ------

diff --git a/git.html b/git.html
index 1a5c7ca94b413eef94565686e0c9846e33193219..009f915913b09ed005b77d3a8db5417ea6a4ac00 100644 (file)
--- a/git.html
+++ b/git.html
@@ -1949,7 +1949,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 31-Oct-2007 05:56:51 UTC\r
+Last updated 02-Nov-2007 02:47:22 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git.txt b/git.txt
index c4d87ac201e2d7a9f43a0d288af15578f51e3785..6db7ae1ea7073ecef07430f13d6bf88758c922ff 100644 (file)
--- a/git.txt
+++ b/git.txt
@@ -46,6 +46,7 @@ Documentation for older releases are available here:
 * link:v1.5.3/git.html[documentation for release 1.5.3]
 
 * release notes for
+  link:RelNotes-1.5.3.5.txt[1.5.3.5],
   link:RelNotes-1.5.3.4.txt[1.5.3.4],
   link:RelNotes-1.5.3.3.txt[1.5.3.3],
   link:RelNotes-1.5.3.2.txt[1.5.3.2],