Autogenerated HTML docs for v1.6.0-36-g3814c

diff --git a/cmds-foreignscminterface.txt b/cmds-foreignscminterface.txt
index 48d7772d4c36a341cafe90d7c464d26a27253a28..441aa994c626d0631c39555d8524bc6f24ddf5a8 100644 (file)
--- a/cmds-foreignscminterface.txt
+++ b/cmds-foreignscminterface.txt
@@ -11,7 +11,7 @@ linkgit:git-cvsserver[1]::
        A CVS server emulator for git.
 
 linkgit:git-imap-send[1]::
-       Dump a mailbox from stdin into an imap folder.
+       Send a collection of patches from stdin to an IMAP folder.
 
 linkgit:git-quiltimport[1]::
        Applies a quilt patchset onto the current branch.

diff --git a/config.txt b/config.txt
index 676c39bb8436f35e1471b8dd50fd888ae1ac5c6b..9020675866e6af6252b83d7df0bb8bc78249f4a6 100644 (file)
--- a/config.txt
+++ b/config.txt
@@ -567,6 +567,10 @@ diff.autorefreshindex::
        affects only 'git-diff' Porcelain, and not lower level
        'diff' commands, such as 'git-diff-files'.
 
+diff.suppress-blank-empty::
+       A boolean to inhibit the standard behavior of printing a space
+       before each empty output line. Defaults to false.
+
 diff.external::
        If this config variable is set, diff generation is not
        performed using the internal diff machinery, but using the

diff --git a/diff-options.txt b/diff-options.txt
index cba90fd27c6a1baaca884328e96adc8a6da8fc36..17593864041189b7d073b05627cfc5cfee1301da 100644 (file)
--- a/diff-options.txt
+++ b/diff-options.txt
@@ -107,9 +107,9 @@ endif::git-format-patch[]
        --exit-code.
 
 --full-index::
-       Instead of the first handful characters, show full
-       object name of pre- and post-image blob on the "index"
-       line when generating a patch format output.
+       Instead of the first handful of characters, show the full
+       pre- and post-image blob object names on the "index"
+       line when generating patch format output.
 
 --binary::
        In addition to --full-index, output "binary diff" that

diff --git a/git-checkout.html b/git-checkout.html
index f997d75f6d1f9b066609592381c4e009fced4372..afa2b48a98382be0337f894c9c6ba152a4eac5a8 100644 (file)
--- a/git-checkout.html
+++ b/git-checkout.html
@@ -321,7 +321,7 @@ git-checkout(1) Manual Page
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
 <div class="verseblock">\r
-<div class="content"><em>git checkout</em> [-q] [-f] [[--track | --no-track] -b &lt;new_branch&gt; [-l]] [-m] [&lt;branch&gt;]\r
+<div class="content"><em>git checkout</em> [-q] [-f] [--track | --no-track] [-b &lt;new_branch&gt; [-l]] [-m] [&lt;branch&gt;]\r
 <em>git checkout</em> [&lt;tree-ish&gt;] [--] &lt;paths&gt;&#8230;</div></div>\r
 </div>\r
 <h2 id="_description">DESCRIPTION</h2>\r
@@ -332,6 +332,9 @@ branch, &lt;branch&gt;, and updating HEAD to be &lt;branch&gt; or, if
 specified, &lt;new_branch&gt;.  Using -b will cause &lt;new_branch&gt; to\r
 be created; in this case you can use the --track or --no-track\r
 options, which will be passed to <tt>git branch</tt>.</p></div>\r
+<div class="para"><p>As a convenience, --track will default to create a branch whose\r
+name is constructed from the specified branch name by stripping\r
+the first namespace level.</p></div>\r
 <div class="para"><p>When &lt;paths&gt; are given, this command does <strong>not</strong> switch\r
 branches.  It updates the named paths in the working tree from\r
 the index file (i.e. it runs <tt>git checkout-index -f -u</tt>), or\r
@@ -392,6 +395,9 @@ working tree.</p></div>
         given. Set it to <tt>always</tt> if you want this behavior when the\r
         start-point is either a local or remote branch.\r
 </p>\r
+<div class="para"><p>If no <em>-b</em> option was given, a name will be made up for you, by stripping\r
+the part up to the first slash of the tracked branch.  For example, if you\r
+called <em>git checkout --track origin/next</em>, the branch name will be <em>next</em>.</p></div>\r
 </dd>\r
 <dt>\r
 --no-track\r
@@ -590,7 +596,7 @@ $ git add frotz</tt></pre>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 2008-07-26 06:45:37 UTC\r
+Last updated 2008-08-20 09:13:27 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-checkout.txt b/git-checkout.txt
index 5aa69c0e12a6756fd6f79c117008a373f65ba5f5..43d4502547128c3155f598ae9c00b18d17c1ec2c 100644 (file)
--- a/git-checkout.txt
+++ b/git-checkout.txt
@@ -8,7 +8,7 @@ git-checkout - Checkout a branch or paths to the working tree
 SYNOPSIS
 --------
 [verse]
-'git checkout' [-q] [-f] [[--track | --no-track] -b <new_branch> [-l]] [-m] [<branch>]
+'git checkout' [-q] [-f] [--track | --no-track] [-b <new_branch> [-l]] [-m] [<branch>]
 'git checkout' [<tree-ish>] [--] <paths>...
 
 DESCRIPTION
@@ -21,6 +21,10 @@ specified, <new_branch>.  Using -b will cause <new_branch> to
 be created; in this case you can use the --track or --no-track
 options, which will be passed to `git branch`.
 
+As a convenience, --track will default to create a branch whose
+name is constructed from the specified branch name by stripping
+the first namespace level.
+
 When <paths> are given, this command does *not* switch
 branches.  It updates the named paths in the working tree from
 the index file (i.e. it runs `git checkout-index -f -u`), or
@@ -59,6 +63,10 @@ OPTIONS
        'git-checkout' and 'git-branch' to always behave as if '--no-track' were
        given. Set it to `always` if you want this behavior when the
        start-point is either a local or remote branch.
++
+If no '-b' option was given, a name will be made up for you, by stripping
+the part up to the first slash of the tracked branch.  For example, if you
+called 'git checkout --track origin/next', the branch name will be 'next'.
 
 --no-track::
        Ignore the branch.autosetupmerge configuration variable.

diff --git a/git-config.html b/git-config.html
index 519d35a29c003a23e1e436a26d21e8956123a275..76fe6f1718e9db0802c6e819f4b3dac6861b73e0 100644 (file)
--- a/git-config.html
+++ b/git-config.html
@@ -1548,6 +1548,15 @@ diff.autorefreshindex
 </p>\r
 </dd>\r
 <dt>\r
+diff.suppress-blank-empty\r
+</dt>\r
+<dd>\r
+<p>\r
+        A boolean to inhibit the standard behavior of printing a space\r
+        before each empty output line. Defaults to false.\r
+</p>\r
+</dd>\r
+<dt>\r
 diff.external\r
 </dt>\r
 <dd>\r
@@ -2710,7 +2719,7 @@ web.browser
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 2008-08-16 10:22:58 UTC\r
+Last updated 2008-08-20 09:13:27 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-files.html b/git-diff-files.html
index 5265df0dd029657d36932534f5c8d26378171b4a..1257abea7cfc6743180248aef2e493fe63905ed5 100644 (file)
--- a/git-diff-files.html
+++ b/git-diff-files.html
@@ -524,9 +524,9 @@ same as for <em>git-diff-index</em> and <em>git-diff-tree</em>.</p></div>
 </dt>\r
 <dd>\r
 <p>\r
-        Instead of the first handful characters, show full\r
-        object name of pre- and post-image blob on the "index"\r
-        line when generating a patch format output.\r
+        Instead of the first handful of characters, show the full\r
+        pre- and post-image blob object names on the "index"\r
+        line when generating patch format output.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -1339,7 +1339,7 @@ the pathname, but if that is <tt>NUL</tt>, the record will show two paths.</p></
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 2008-07-22 09:19:06 UTC\r
+Last updated 2008-08-20 09:13:28 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-index.html b/git-diff-index.html
index 76a3efc91656e939fe7f928c200b4b727d61e7ec..d004fc8fb954471e2f395e8452914f8989eaf090 100644 (file)
--- a/git-diff-index.html
+++ b/git-diff-index.html
@@ -525,9 +525,9 @@ entries in the index are compared.</p></div>
 </dt>\r
 <dd>\r
 <p>\r
-        Instead of the first handful characters, show full\r
-        object name of pre- and post-image blob on the "index"\r
-        line when generating a patch format output.\r
+        Instead of the first handful of characters, show the full\r
+        pre- and post-image blob object names on the "index"\r
+        line when generating patch format output.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -1426,7 +1426,7 @@ always have the special all-zero sha1.</td>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 2008-07-22 09:19:06 UTC\r
+Last updated 2008-08-20 09:13:29 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-tree.html b/git-diff-tree.html
index ebdcbd6afaf5d2ef7c3554bda23063e95aca7cb1..d1d79ed69aff436f4a6af98d225f9e19da127133 100644 (file)
--- a/git-diff-tree.html
+++ b/git-diff-tree.html
@@ -527,9 +527,9 @@ git-diff-tree(1) Manual Page
 </dt>\r
 <dd>\r
 <p>\r
-        Instead of the first handful characters, show full\r
-        object name of pre- and post-image blob on the "index"\r
-        line when generating a patch format output.\r
+        Instead of the first handful of characters, show the full\r
+        pre- and post-image blob object names on the "index"\r
+        line when generating patch format output.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -1855,7 +1855,7 @@ the pathname, but if that is <tt>NUL</tt>, the record will show two paths.</p></
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 2008-08-07 00:17:34 UTC\r
+Last updated 2008-08-20 09:13:30 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff.html b/git-diff.html
index 2ec015d0cd07b1d22faeaf785bd36676eaf01a1e..7d6e693182371fd387d64a6f0e1c7d890495d4ab 100644 (file)
--- a/git-diff.html
+++ b/git-diff.html
@@ -603,9 +603,9 @@ and the range notations ("<commit>..<commit>" and
 </dt>\r
 <dd>\r
 <p>\r
-        Instead of the first handful characters, show full\r
-        object name of pre- and post-image blob on the "index"\r
-        line when generating a patch format output.\r
+        Instead of the first handful of characters, show the full\r
+        pre- and post-image blob object names on the "index"\r
+        line when generating patch format output.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -1541,7 +1541,7 @@ Output diff in reverse.
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 2008-07-22 09:19:07 UTC\r
+Last updated 2008-08-20 09:13:30 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-format-patch.html b/git-format-patch.html
index dd01892b15754dac66e7a4af05ae7af97844a89a..9fabc3d301824969426fd74bb734156d35d694ac 100644 (file)
--- a/git-format-patch.html
+++ b/git-format-patch.html
@@ -573,9 +573,9 @@ reference.</p></div>
 </dt>\r
 <dd>\r
 <p>\r
-        Instead of the first handful characters, show full\r
-        object name of pre- and post-image blob on the "index"\r
-        line when generating a patch format output.\r
+        Instead of the first handful of characters, show the full\r
+        pre- and post-image blob object names on the "index"\r
+        line when generating patch format output.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -1151,7 +1151,7 @@ as e-mailable patches:
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 2008-08-15 05:34:27 UTC\r
+Last updated 2008-08-20 09:13:32 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-hash-object.html b/git-hash-object.html
index 0f760f0d2f05f9cbadf57dafa9c8b653396c9852..8b2c32a4b819e581b1ddb9a59d79535608b87e0f 100644 (file)
--- a/git-hash-object.html
+++ b/git-hash-object.html
@@ -320,7 +320,9 @@ git-hash-object(1) Manual Page
 </div>\r
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
-<div class="para"><p><em>git hash-object</em> [-t &lt;type&gt;] [-w] [--stdin | --stdin-paths] [--] &lt;file&gt;&#8230;</p></div>\r
+<div class="verseblock">\r
+<div class="content"><em>git hash-object</em> [-t &lt;type&gt;] [-w] [--path=&lt;file&gt;|--no-filters] [--stdin] [--] &lt;file&gt;&#8230;\r
+<em>git hash-object</em> [-t &lt;type&gt;] [-w] --stdin-paths &lt; &lt;list-of-paths&gt;</div></div>\r
 </div>\r
 <h2 id="_description">DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -367,6 +369,32 @@ specified, it defaults to "blob".</p></div>
         Read file names from stdin instead of from the command-line.\r
 </p>\r
 </dd>\r
+<dt>\r
+--path\r
+</dt>\r
+<dd>\r
+<p>\r
+        Hash object as it were located at the given path. The location of\r
+        file does not directly influence on the hash value, but path is\r
+        used to determine what git filters should be applied to the object\r
+        before it can be placed to the object database, and, as result of\r
+        applying filters, the actual blob put into the object database may\r
+        differ from the given file. This option is mainly useful for hashing\r
+        temporary files located outside of the working directory or files\r
+        read from stdin.\r
+</p>\r
+</dd>\r
+<dt>\r
+--no-filters\r
+</dt>\r
+<dd>\r
+<p>\r
+        Hash the contents as is, ignoring any input filter that would\r
+        have been chosen by the attributes mechanism, including crlf\r
+        conversion. If the file is read from standard input then this\r
+        is always implied, unless the --path option is given.\r
+</p>\r
+</dd>\r
 </dl></div>\r
 </div>\r
 <h2 id="_author">Author</h2>\r
@@ -383,7 +411,7 @@ specified, it defaults to "blob".</p></div>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 2008-07-22 09:19:10 UTC\r
+Last updated 2008-08-20 09:13:32 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-hash-object.txt b/git-hash-object.txt
index ac928e198e75595a6fcd4e83b89aaf68987bd420..0af40cfb85ca6e0eb6e540f0beb47e449ef25afd 100644 (file)
--- a/git-hash-object.txt
+++ b/git-hash-object.txt
@@ -8,7 +8,9 @@ git-hash-object - Compute object ID and optionally creates a blob from a file
 
 SYNOPSIS
 --------
-'git hash-object' [-t <type>] [-w] [--stdin | --stdin-paths] [--] <file>...
+[verse]
+'git hash-object' [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] <file>...
+'git hash-object' [-t <type>] [-w] --stdin-paths < <list-of-paths>
 
 DESCRIPTION
 -----------
@@ -35,6 +37,22 @@ OPTIONS
 --stdin-paths::
        Read file names from stdin instead of from the command-line.
 
+--path::
+       Hash object as it were located at the given path. The location of
+       file does not directly influence on the hash value, but path is
+       used to determine what git filters should be applied to the object
+       before it can be placed to the object database, and, as result of
+       applying filters, the actual blob put into the object database may
+       differ from the given file. This option is mainly useful for hashing
+       temporary files located outside of the working directory or files
+       read from stdin.
+
+--no-filters::
+       Hash the contents as is, ignoring any input filter that would
+       have been chosen by the attributes mechanism, including crlf
+       conversion. If the file is read from standard input then this
+       is always implied, unless the --path option is given.
+
 Author
 ------
 Written by Junio C Hamano <gitster@pobox.com>

diff --git a/git-imap-send.html b/git-imap-send.html
index 742816742154ee834cd7fb4cf399933dfbb1fc4c..4dcff7707e83e226f515f61837a9051ef39c28bd 100644 (file)
--- a/git-imap-send.html
+++ b/git-imap-send.html
@@ -314,7 +314,7 @@ git-imap-send(1) Manual Page
 <h2>NAME</h2>\r
 <div class="sectionbody">\r
 <p>git-imap-send -\r
-   Dump a mailbox from stdin into an imap folder\r
+   Send a collection of patches from stdin to an IMAP folder\r
 </p>\r
 </div>\r
 </div>\r
@@ -324,30 +324,114 @@ git-imap-send(1) Manual Page
 </div>\r
 <h2 id="_description">DESCRIPTION</h2>\r
 <div class="sectionbody">\r
-<div class="para"><p>This command uploads a mailbox generated with git-format-patch\r
-into an imap drafts folder.  This allows patches to be sent as\r
-other email is sent with mail clients that cannot read mailbox\r
+<div class="para"><p>This command uploads a mailbox generated with <em>git-format-patch</em>\r
+into an IMAP drafts folder.  This allows patches to be sent as\r
+other email is when using mail clients that cannot read mailbox\r
 files directly.</p></div>\r
 <div class="para"><p>Typical usage is something like:</p></div>\r
 <div class="para"><p>git format-patch --signoff --stdout --attach origin | git imap-send</p></div>\r
 </div>\r
 <h2 id="_configuration">CONFIGURATION</h2>\r
 <div class="sectionbody">\r
-<div class="para"><p><em>git-imap-send</em> requires the following values in the repository\r
-configuration file (shown with examples):</p></div>\r
+<div class="para"><p>To use the tool, imap.folder and either imap.tunnel or imap.host must be set\r
+to appropriate values.</p></div>\r
+<h3 id="_variables">Variables</h3><div style="clear:left"></div>\r
+<div class="vlist"><dl>\r
+<dt>\r
+imap.folder\r
+</dt>\r
+<dd>\r
+<p>\r
+        The folder to drop the mails into, which is typically the Drafts\r
+        folder. For example: "INBOX.Drafts", "INBOX/Drafts" or\r
+        "[Gmail]/Drafts". Required to use imap-send.\r
+</p>\r
+</dd>\r
+<dt>\r
+imap.tunnel\r
+</dt>\r
+<dd>\r
+<p>\r
+        Command used to setup a tunnel to the IMAP server through which\r
+        commands will be piped instead of using a direct network connection\r
+        to the server. Required when imap.host is not set to use imap-send.\r
+</p>\r
+</dd>\r
+<dt>\r
+imap.host\r
+</dt>\r
+<dd>\r
+<p>\r
+        A URL identifying the server. Use a <tt>imap://</tt> prefix for non-secure\r
+        connections and a <tt>imaps://</tt> prefix for secure connections.\r
+        Ignored when imap.tunnel is set, but required to use imap-send\r
+        otherwise.\r
+</p>\r
+</dd>\r
+<dt>\r
+imap.user\r
+</dt>\r
+<dd>\r
+<p>\r
+        The username to use when logging in to the server.\r
+</p>\r
+</dd>\r
+<dt>\r
+imap.password\r
+</dt>\r
+<dd>\r
+<p>\r
+        The password to use when logging in to the server.\r
+</p>\r
+</dd>\r
+<dt>\r
+imap.port\r
+</dt>\r
+<dd>\r
+<p>\r
+        An integer port number to connect to on the server.\r
+        Defaults to 143 for imap:// hosts and 993 for imaps:// hosts.\r
+        Ignored when imap.tunnel is set.\r
+</p>\r
+</dd>\r
+<dt>\r
+imap.sslverify\r
+</dt>\r
+<dd>\r
+<p>\r
+        A boolean to enable/disable verification of the server certificate\r
+        used by the SSL/TLS connection. Default is <tt>true</tt>. Ignored when\r
+        imap.tunnel is set.\r
+</p>\r
+</dd>\r
+</dl></div>\r
+<h3 id="_examples">Examples</h3><div style="clear:left"></div>\r
+<div class="para"><p>Using tunnel mode:</p></div>\r
 <div class="literalblock">\r
 <div class="content">\r
 <pre><tt>[imap]\r
-    Folder = "INBOX.Drafts"\r
-\r
-[imap]\r
-    Tunnel = "ssh -q user@server.com /usr/bin/imapd ./Maildir 2&gt; /dev/null"\r
-\r
-[imap]\r
-    Host = imap.server.com\r
-    User = bob\r
-    Pass = pwd\r
-    Port = 143</tt></pre>\r
+    folder = "INBOX.Drafts"\r
+    tunnel = "ssh -q -C user@example.com /usr/bin/imapd ./Maildir 2&gt; /dev/null"</tt></pre>\r
+</div></div>\r
+<div class="para"><p>Using direct mode:</p></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>[imap]\r
+    folder = "INBOX.Drafts"\r
+    host = imap://imap.example.com\r
+    user = bob\r
+    pass = p4ssw0rd</tt></pre>\r
+</div></div>\r
+<div class="para"><p>Using direct mode with SSL:</p></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>[imap]\r
+    folder = "INBOX.Drafts"\r
+    host = imaps://imap.example.com\r
+    user = bob\r
+    pass = p4ssw0rd\r
+    port = 123\r
+    sslverify = false</tt></pre>\r
 </div></div>\r
 </div>\r
 <h2 id="_bugs">BUGS</h2>\r
@@ -368,7 +452,7 @@ configuration file (shown with examples):</p></div>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 2008-07-06 05:16:50 UTC\r
+Last updated 2008-08-20 09:13:32 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-imap-send.txt b/git-imap-send.txt
index b3d8da33ee64730794821440c287f30c4bb85789..bd49a0aee8881f983077d74bd8d0fbe5764dfea5 100644 (file)
--- a/git-imap-send.txt
+++ b/git-imap-send.txt
@@ -3,7 +3,7 @@ git-imap-send(1)
 
 NAME
 ----
-git-imap-send - Dump a mailbox from stdin into an imap folder
+git-imap-send - Send a collection of patches from stdin to an IMAP folder
 
 
 SYNOPSIS
@@ -13,9 +13,9 @@ SYNOPSIS
 
 DESCRIPTION
 -----------
-This command uploads a mailbox generated with git-format-patch
-into an imap drafts folder.  This allows patches to be sent as
-other email is sent with mail clients that cannot read mailbox
+This command uploads a mailbox generated with 'git-format-patch'
+into an IMAP drafts folder.  This allows patches to be sent as
+other email is when using mail clients that cannot read mailbox
 files directly.
 
 Typical usage is something like:
@@ -26,21 +26,75 @@ git format-patch --signoff --stdout --attach origin | git imap-send
 CONFIGURATION
 -------------
 
-'git-imap-send' requires the following values in the repository
-configuration file (shown with examples):
+To use the tool, imap.folder and either imap.tunnel or imap.host must be set
+to appropriate values.
+
+Variables
+~~~~~~~~~
+
+imap.folder::
+       The folder to drop the mails into, which is typically the Drafts
+       folder. For example: "INBOX.Drafts", "INBOX/Drafts" or
+       "[Gmail]/Drafts". Required to use imap-send.
+
+imap.tunnel::
+       Command used to setup a tunnel to the IMAP server through which
+       commands will be piped instead of using a direct network connection
+       to the server. Required when imap.host is not set to use imap-send.
+
+imap.host::
+       A URL identifying the server. Use a `imap://` prefix for non-secure
+       connections and a `imaps://` prefix for secure connections.
+       Ignored when imap.tunnel is set, but required to use imap-send
+       otherwise.
+
+imap.user::
+       The username to use when logging in to the server.
+
+imap.password::
+       The password to use when logging in to the server.
+
+imap.port::
+       An integer port number to connect to on the server.
+       Defaults to 143 for imap:// hosts and 993 for imaps:// hosts.
+       Ignored when imap.tunnel is set.
+
+imap.sslverify::
+       A boolean to enable/disable verification of the server certificate
+       used by the SSL/TLS connection. Default is `true`. Ignored when
+       imap.tunnel is set.
+
+Examples
+~~~~~~~~
+
+Using tunnel mode:
 
 ..........................
 [imap]
-    Folder = "INBOX.Drafts"
+    folder = "INBOX.Drafts"
+    tunnel = "ssh -q -C user@example.com /usr/bin/imapd ./Maildir 2> /dev/null"
+..........................
 
+Using direct mode:
+
+.........................
 [imap]
-    Tunnel = "ssh -q user@server.com /usr/bin/imapd ./Maildir 2> /dev/null"
+    folder = "INBOX.Drafts"
+    host = imap://imap.example.com
+    user = bob
+    pass = p4ssw0rd
+..........................
+
+Using direct mode with SSL:
 
+.........................
 [imap]
-    Host = imap.server.com
-    User = bob
-    Pass = pwd
-    Port = 143
+    folder = "INBOX.Drafts"
+    host = imaps://imap.example.com
+    user = bob
+    pass = p4ssw0rd
+    port = 123
+    sslverify = false
 ..........................
 
 

diff --git a/git-log.html b/git-log.html
index 3cadd90067224114a63194068c6141f625dfd813..6d7ecdf32490b10bc704b2995299f7f712f2e9c8 100644 (file)
--- a/git-log.html
+++ b/git-log.html
@@ -525,9 +525,9 @@ each commit introduces are shown.</p></div>
 </dt>\r
 <dd>\r
 <p>\r
-        Instead of the first handful characters, show full\r
-        object name of pre- and post-image blob on the "index"\r
-        line when generating a patch format output.\r
+        Instead of the first handful of characters, show the full\r
+        pre- and post-image blob object names on the "index"\r
+        line when generating patch format output.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -2166,7 +2166,7 @@ reversible operation.</p></div>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 2008-08-13 20:03:49 UTC\r
+Last updated 2008-08-20 09:13:33 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git.html b/git.html
index 7d625afd22227c3aa1c0fcd74da28828cb9781ed..b327e15b8a9f15b2f5622e0d0d0d97be81ef360a 100644 (file)
--- a/git.html
+++ b/git.html
@@ -1015,7 +1015,7 @@ people via patch over e-mail.</p></div>
 </dt>\r
 <dd>\r
 <p>\r
-        Dump a mailbox from stdin into an imap folder.\r
+        Send a collection of patches from stdin to an IMAP folder.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -2024,7 +2024,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-17 21:04:42 UTC\r
+Last updated 2008-08-20 09:13:33 UTC\r
 </div>\r
 </div>\r
 </body>\r