Autogenerated HTML docs for v1.5.2-rc1-20-g86b9

diff --git a/config.txt b/config.txt
index c257cdf525e2daa3b90140430327e6f5d2ea6bda..24f9655fef8b9acbeb239554d55585480a0eede7 100644 (file)
--- a/config.txt
+++ b/config.txt
@@ -520,7 +520,7 @@ merge.summary::
 merge.tool::
        Controls which merge resolution program is used by
        gitlink:git-mergetool[l].  Valid values are: "kdiff3", "tkdiff",
-       "meld", "xxdiff", "emerge", "vimdiff"
+       "meld", "xxdiff", "emerge", "vimdiff", and "opendiff"
 
 merge.verbosity::
        Controls the amount of output shown by the recursive merge

diff --git a/git-config.html b/git-config.html
index 9ec7136fc01d5eed3752b50f587c30c21f60c788..74bccbfc69b86b405bf33f3bf9c0c83677f02dae 100644 (file)
--- a/git-config.html
+++ b/git-config.html
@@ -1370,7 +1370,7 @@ merge.tool
 <p>\r
         Controls which merge resolution program is used by\r
         <a href="git-mergetool.html">git-mergetool(l)</a>.  Valid values are: "kdiff3", "tkdiff",\r
-        "meld", "xxdiff", "emerge", "vimdiff"\r
+        "meld", "xxdiff", "emerge", "vimdiff", and "opendiff"\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -1654,7 +1654,7 @@ transfer.unpackLimit
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 29-Apr-2007 18:29:50 UTC\r
+Last updated 04-May-2007 07:07:21 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-mergetool.html b/git-mergetool.html
index c11ca07308a9fe120fda86ab61de7d723ea360bd..0601ca69687dbd5e47afe951dd65cbb732486e04 100644 (file)
--- a/git-mergetool.html
+++ b/git-mergetool.html
@@ -293,7 +293,7 @@ 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, and vimdiff.\r
+        kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, 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
@@ -316,7 +316,7 @@ will pick a suitable default.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:51 UTC\r
+Last updated 04-May-2007 07:07:21 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-mergetool.txt b/git-mergetool.txt
index 34288fe08b3962554178fd8a6baa8f7030096baf..add01e855a09c34b6aa9c83af6efcd17f24f3c9d 100644 (file)
--- a/git-mergetool.txt
+++ b/git-mergetool.txt
@@ -25,7 +25,7 @@ OPTIONS
 -t or --tool=<tool>::
        Use the merge resolution program specified by <tool>.
        Valid merge tools are:
-       kdiff3, tkdiff, meld, xxdiff, emerge, and vimdiff.
+       kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, and opendiff
 +
 If a merge resolution program is not specified, 'git mergetool'
 will use the configuration variable merge.tool.  If the

diff --git a/git-tag.html b/git-tag.html
index 57989527a05292b1f5184eaf1b0114dfca09de09..80358e0840bac6ad5b06f8ee7ae23aca08e526d4 100644 (file)
--- a/git-tag.html
+++ b/git-tag.html
@@ -273,9 +273,10 @@ git-tag(1) Manual Page
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
 <div class="verseblock">\r
-<div class="content"><em>git-tag</em> [-a | -s | -u &lt;key-id&gt;] [-f | -v] [-m &lt;msg&gt; | -F &lt;file&gt;]  &lt;name&gt; [&lt;head&gt;]\r
+<div class="content"><em>git-tag</em> [-a | -s | -u &lt;key-id&gt;] [-f] [-m &lt;msg&gt; | -F &lt;file&gt;]  &lt;name&gt; [&lt;head&gt;]\r
 <em>git-tag</em> -d &lt;name&gt;&#8230;\r
-<em>git-tag</em> -l [&lt;pattern&gt;]</div></div>\r
+<em>git-tag</em> -l [&lt;pattern&gt;]\r
+<em>git-tag</em> -v &lt;name&gt;</div></div>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -381,9 +382,10 @@ if no pattern is given).</p>
 committer identity (of the form "Your Name &lt;your@email.address&gt;") to\r
 find a key.  If you want to use a different default key, you can specify\r
 it in the repository configuration as follows:</p>\r
-<div class="literalblock">\r
+<div class="listingblock">\r
 <div class="content">\r
-<pre><tt>signingkey = &lt;gpg-key-id&gt;</tt></pre>\r
+<pre><tt>[user]\r
+    signingkey = &lt;gpg-key-id&gt;</tt></pre>\r
 </div></div>\r
 </div>\r
 <h2>DISCUSSION</h2>\r
@@ -519,7 +521,7 @@ Junio C Hamano &lt;junkio@cox.net&gt; and Chris Wright &lt;chrisw@osdl.org&gt;.<
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 04-Apr-2007 18:34:30 UTC\r
+Last updated 04-May-2007 07:07:21 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-tag.txt b/git-tag.txt
index 70235e8ddb3e43805d699dd0bf264f585409697e..4e3e02756c8863dbc6fe1d745e1a8c9a97c18919 100644 (file)
--- a/git-tag.txt
+++ b/git-tag.txt
@@ -9,9 +9,10 @@ git-tag - Create, list, delete or verify a tag object signed with GPG
 SYNOPSIS
 --------
 [verse]
-'git-tag' [-a | -s | -u <key-id>] [-f | -v] [-m <msg> | -F <file>]  <name> [<head>]
+'git-tag' [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]  <name> [<head>]
 'git-tag' -d <name>...
 'git-tag' -l [<pattern>]
+'git-tag' -v <name>
 
 DESCRIPTION
 -----------
@@ -77,8 +78,10 @@ committer identity (of the form "Your Name <your@email.address>") to
 find a key.  If you want to use a different default key, you can specify
 it in the repository configuration as follows:
 
+-------------------------------------
 [user]
     signingkey = <gpg-key-id>
+-------------------------------------
 
 
 DISCUSSION