Autogenerated HTML docs for v1.5.4.1-97-g40aab

diff --git a/config.txt b/config.txt
index 3e10feb9fbbf44c634c32f30dd23a4534535190d..f9bdb164e054ec2d633baab3da69ddd47e14931f 100644 (file)
--- a/config.txt
+++ b/config.txt
@@ -333,7 +333,7 @@ branch.autosetupmerge::
        so that linkgit:git-pull[1] will appropriately merge from that
        remote branch.  Note that even if this option is not set,
        this behavior can be chosen per-branch using the `--track`
-       and `--no-track` options.  This option defaults to false.
+       and `--no-track` options.  This option defaults to true.
 
 branch.<name>.remote::
        When in branch <name>, it tells `git fetch` which remote to fetch.

diff --git a/git-branch.html b/git-branch.html
index d8d405cfde627a8829ac9c397d8f3d0af8c1cda6..227436d9cc4e3ee52f5c3ea0f6b5396f2c97b434 100644 (file)
--- a/git-branch.html
+++ b/git-branch.html
@@ -296,11 +296,11 @@ equal to that of the currently checked out branch.</p>
 <p>Note that this will create the new branch, but it will not switch the\r
 working tree to it; use "git checkout &lt;newbranch&gt;" to switch to the\r
 new branch.</p>\r
-<p>When a local branch is started off a remote branch, git can setup the\r
+<p>When a local branch is started off a remote branch, git sets up the\r
 branch so that <a href="git-pull.html">git-pull(1)</a> will appropriately merge from that\r
-remote branch.  If this behavior is desired, it is possible to make it\r
-the default using the global <tt>branch.autosetupmerge</tt> configuration\r
-flag.  Otherwise, it can be chosen per-branch using the <tt>--track</tt>\r
+remote branch.  If this behavior is not desired, it is possible to\r
+disable it using the global <tt>branch.autosetupmerge</tt> configuration\r
+flag.  That setting can be overridden by using the <tt>--track</tt>\r
 and <tt>--no-track</tt> options.</p>\r
 <p>With a <em>-m</em> or <em>-M</em> option, &lt;oldbranch&gt; will be renamed to &lt;newbranch&gt;.\r
 If &lt;oldbranch&gt; had a corresponding reflog, it is renamed to match\r
@@ -436,10 +436,11 @@ clean up all obsolete remote-tracking branches.</p>
         Set up configuration so that git-pull will automatically\r
         retrieve data from the remote branch.  Use this if you always\r
         pull from the same remote branch into the new branch, or if you\r
-        don't want to use "git pull &lt;repository&gt; &lt;refspec&gt;" explicitly.  Set the\r
-        branch.autosetupmerge configuration variable to true if you\r
+        don't want to use "git pull &lt;repository&gt; &lt;refspec&gt;" explicitly.\r
+        This behavior is the default.  Set the\r
+        branch.autosetupmerge configuration variable to false if you\r
         want git-checkout and git-branch to always behave as if\r
-        <em>--track</em> were given.\r
+        <em>--no-track</em> were given.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -565,7 +566,7 @@ a branch and check it out with a single command.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:03 UTC\r
+Last updated 12-Feb-2008 03:18:04 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-branch.txt b/git-branch.txt
index f920c04cc01e1d8a8675876adcb747f91ed86f30..7e8874acaacbd6990ccaf66d5bddbff6e4c1e5ba 100644 (file)
--- a/git-branch.txt
+++ b/git-branch.txt
@@ -34,11 +34,11 @@ Note that this will create the new branch, but it will not switch the
 working tree to it; use "git checkout <newbranch>" to switch to the
 new branch.
 
-When a local branch is started off a remote branch, git can setup the
+When a local branch is started off a remote branch, git sets up the
 branch so that linkgit:git-pull[1] will appropriately merge from that
-remote branch.  If this behavior is desired, it is possible to make it
-the default using the global `branch.autosetupmerge` configuration
-flag.  Otherwise, it can be chosen per-branch using the `--track`
+remote branch.  If this behavior is not desired, it is possible to
+disable it using the global `branch.autosetupmerge` configuration
+flag.  That setting can be overridden by using the `--track`
 and `--no-track` options.
 
 With a '-m' or '-M' option, <oldbranch> will be renamed to <newbranch>.
@@ -108,10 +108,11 @@ OPTIONS
        Set up configuration so that git-pull will automatically
        retrieve data from the remote branch.  Use this if you always
        pull from the same remote branch into the new branch, or if you
-       don't want to use "git pull <repository> <refspec>" explicitly.  Set the
-       branch.autosetupmerge configuration variable to true if you
+       don't want to use "git pull <repository> <refspec>" explicitly.
+       This behavior is the default.  Set the
+       branch.autosetupmerge configuration variable to false if you
        want git-checkout and git-branch to always behave as if
-       '--track' were given.
+       '--no-track' were given.
 
 --no-track::
        When a branch is created off a remote branch,

diff --git a/git-checkout.html b/git-checkout.html
index 06b86e1c81ff76971feb1c9ecc9088d246f30863..83420b0469b1761be151614375e35976172ce74e 100644 (file)
--- a/git-checkout.html
+++ b/git-checkout.html
@@ -334,10 +334,11 @@ working tree.</p>
         set up configuration so that git-pull will automatically\r
         retrieve data from the remote branch.  Use this if you always\r
         pull from the same remote branch into the new branch, or if you\r
-        don't want to use "git pull &lt;repository&gt; &lt;refspec&gt;" explicitly.  Set the\r
-        branch.autosetupmerge configuration variable to true if you\r
+        don't want to use "git pull &lt;repository&gt; &lt;refspec&gt;" explicitly.\r
+        This behavior is the default.  Set the\r
+        branch.autosetupmerge configuration variable to false if you\r
         want git-checkout and git-branch to always behave as if\r
-        <em>--track</em> were given.\r
+        <em>--no-track</em> were given.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -540,7 +541,7 @@ $ git add frotz</tt></pre>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:05 UTC\r
+Last updated 12-Feb-2008 03:18:04 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-checkout.txt b/git-checkout.txt
index 584359ff3fdc4167b4af404ab92d34d3a057033c..b4cfa044bbb969add6f434070a8666fc0c325d15 100644 (file)
--- a/git-checkout.txt
+++ b/git-checkout.txt
@@ -52,10 +52,11 @@ OPTIONS
        set up configuration so that git-pull will automatically
        retrieve data from the remote branch.  Use this if you always
        pull from the same remote branch into the new branch, or if you
-       don't want to use "git pull <repository> <refspec>" explicitly.  Set the
-       branch.autosetupmerge configuration variable to true if you
+       don't want to use "git pull <repository> <refspec>" explicitly.
+       This behavior is the default.  Set the
+       branch.autosetupmerge configuration variable to false if you
        want git-checkout and git-branch to always behave as if
-       '--track' were given.
+       '--no-track' were given.
 
 --no-track::
        When -b is given and a branch is created off a remote branch,

diff --git a/git-config.html b/git-config.html
index a928861359667350e248b65bc82c2f0a1542aa81..9f6e96bd5046b4bf147ee4f228efbadfe570f908 100644 (file)
--- a/git-config.html
+++ b/git-config.html
@@ -1153,7 +1153,7 @@ branch.autosetupmerge
         so that <a href="git-pull.html">git-pull(1)</a> will appropriately merge from that\r
         remote branch.  Note that even if this option is not set,\r
         this behavior can be chosen per-branch using the <tt>--track</tt>\r
-        and <tt>--no-track</tt> options.  This option defaults to false.\r
+        and <tt>--no-track</tt> options.  This option defaults to true.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -2220,7 +2220,7 @@ web.browser
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 10-Feb-2008 10:47:42 UTC\r
+Last updated 12-Feb-2008 03:18:05 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-describe.html b/git-describe.html
index 54716684fb7b3f5b31701710d8f68c708a71cdc2..7c33eeacac47acc34ebc6431fbc4afc01610b1af 100644 (file)
--- a/git-describe.html
+++ b/git-describe.html
@@ -350,6 +350,15 @@ additional commits and the abbreviated object name of the commit.</p>
         be printed to standard out.\r
 </p>\r
 </dd>\r
+<dt>\r
+--match &lt;pattern&gt;\r
+</dt>\r
+<dd>\r
+<p>\r
+        Only consider tags matching the given pattern (can be used to avoid\r
+        leaking private tags made from the repository).\r
+</p>\r
+</dd>\r
 </dl>\r
 </div>\r
 <h2>EXAMPLES</h2>\r
@@ -428,7 +437,7 @@ updated by Shawn Pearce &lt;spearce@spearce.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:12 UTC\r
+Last updated 12-Feb-2008 03:18:05 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-describe.txt b/git-describe.txt
index 0742152b811e23ea304feb368c8d949785e2fdfb..1c3dfb40c63350651efb570ed540b69c34ccbc81 100644 (file)
--- a/git-describe.txt
+++ b/git-describe.txt
@@ -51,6 +51,10 @@ OPTIONS
        being employed to standard error.  The tag name will still
        be printed to standard out.
 
+--match <pattern>::
+       Only consider tags matching the given pattern (can be used to avoid
+       leaking private tags made from the repository).
+
 EXAMPLES
 --------
 

diff --git a/git-pull.html b/git-pull.html
index da9aa198189c500b13d842ce60a3cf2d2f3fcd28..8f555da6cb1363f99f8783b715b6985ef7a675fb 100644 (file)
--- a/git-pull.html
+++ b/git-pull.html
@@ -795,13 +795,10 @@ ours
         was rebased since last fetched, the rebase uses that information\r
         to avoid rebasing non-local changes.\r
 </p>\r
-<div class="literalblock">\r
-<div class="content">\r
-<pre><tt>*NOTE:* This is a potentially _dangerous_ mode of operation.\r
+<p><strong>NOTE:</strong> This is a potentially _dangerous_ mode of operation.\r
 It rewrites history, which does not bode well when you\r
-published that history already.  Do *not* use this option\r
-unless you have read linkgit:git-rebase[1] carefully.</tt></pre>\r
-</div></div>\r
+published that history already.  Do <strong>not</strong> use this option\r
+unless you have read <a href="git-rebase.html">git-rebase(1)</a> carefully.</p>\r
 </dd>\r
 <dt>\r
 --no-rebase\r
@@ -973,7 +970,7 @@ Junio C Hamano and the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 27-Jan-2008 08:23:28 UTC\r
+Last updated 12-Feb-2008 03:18:05 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-pull.txt b/git-pull.txt
index 4cc633a5ec4c449e98ac9cb16fd125da6d336798..179bdfc69ddfeff9d272ec309721e4098f3b051e 100644 (file)
--- a/git-pull.txt
+++ b/git-pull.txt
@@ -39,11 +39,11 @@ include::merge-strategies.txt[]
        there is a remote ref for the upstream branch, and this branch
        was rebased since last fetched, the rebase uses that information
        to avoid rebasing non-local changes.
-
-       *NOTE:* This is a potentially _dangerous_ mode of operation.
-       It rewrites history, which does not bode well when you
-       published that history already.  Do *not* use this option
-       unless you have read linkgit:git-rebase[1] carefully.
++
+*NOTE:* This is a potentially _dangerous_ mode of operation.
+It rewrites history, which does not bode well when you
+published that history already.  Do *not* use this option
+unless you have read linkgit:git-rebase[1] carefully.
 
 \--no-rebase::
        Override earlier \--rebase.

diff --git a/git-send-email.html b/git-send-email.html
index 5227151f8402e80bc370b08163d74133ad9a8540..fc370192e06d3a45c18bc45fc715fe35f3e37924 100644 (file)
--- a/git-send-email.html
+++ b/git-send-email.html
@@ -416,15 +416,58 @@ enabled interface to provide the necessary information.</p>
 </p>\r
 </dd>\r
 <dt>\r
---smtp-user, --smtp-pass\r
+--smtp-user\r
 </dt>\r
 <dd>\r
 <p>\r
-        Username and password for SMTP-AUTH. Defaults are the values of\r
-        the configuration values <em>sendemail.smtpuser</em> and\r
-        <em>sendemail.smtppass</em>, but see also <em>sendemail.identity</em>.\r
-        If not set, authentication is not attempted.\r
+        Username for SMTP-AUTH. In place of this option, the following\r
+        configuration variables can be specified:\r
 </p>\r
+<ul>\r
+<li>\r
+<p>\r
+sendemail.smtpuser\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+sendemail.&lt;identity&gt;.smtpuser (see sendemail.identity).\r
+</p>\r
+</li>\r
+</ul>\r
+<p>However, --smtp-user always overrides these variables.</p>\r
+<p>If a username is not specified (with --smtp-user or a\r
+configuration variable), then authentication is not attempted.</p>\r
+</dd>\r
+<dt>\r
+--smtp-pass\r
+</dt>\r
+<dd>\r
+<p>\r
+        Password for SMTP-AUTH. The argument is optional: If no\r
+        argument is specified, then the empty string is used as\r
+        the password.\r
+</p>\r
+<p>In place of this option, the following configuration variables\r
+can be specified:</p>\r
+<ul>\r
+<li>\r
+<p>\r
+sendemail.smtppass\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+sendemail.&lt;identity&gt;.smtppass (see sendemail.identity).\r
+</p>\r
+</li>\r
+</ul>\r
+<p>However, --smtp-pass always overrides these variables.</p>\r
+<p>Furthermore, passwords need not be specified in configuration files\r
+or on the command line. If a username has been specified (with\r
+--smtp-user or a configuration variable), but no password has been\r
+specified (with --smtp-pass or a configuration variable), then the\r
+user is prompted for a password while the input is masked for privacy.</p>\r
 </dd>\r
 <dt>\r
 --smtp-ssl\r
@@ -457,6 +500,22 @@ enabled interface to provide the necessary information.</p>
 </p>\r
 </dd>\r
 <dt>\r
+--suppress-cc\r
+</dt>\r
+<dd>\r
+<p>\r
+        Specify an additional category of recipients to suppress the\r
+        auto-cc of.  <em>self</em> will avoid including the sender, <em>author</em> will\r
+        avoid including the patch author, <em>cc</em> will avoid including anyone\r
+        mentioned in Cc lines in the patch, <em>sob</em> will avoid including\r
+        anyone mentioned in Signed-off-by lines, and <em>cccmd</em> will avoid\r
+        running the --cc-cmd.  <em>all</em> will suppress all auto cc values.\r
+        Default is the value of <em>sendemail.suppresscc</em> configuration value;\r
+        if that is unspecified, default to <em>self</em> if --suppress-from is\r
+        specified, as well as <em>sob</em> if --no-signed-off-cc is specified.\r
+</p>\r
+</dd>\r
+<dt>\r
 --thread, --no-thread\r
 </dt>\r
 <dd>\r
@@ -618,7 +677,7 @@ send_lots_of_email.pl by Greg Kroah-Hartman.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 27-Jan-2008 08:23:29 UTC\r
+Last updated 12-Feb-2008 03:18:06 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-send-email.txt b/git-send-email.txt
index 0554f2b3741bef4213bf7197bf1bb6335c1268c4..336d797e80f5d2cc21b633588b3a3461a991ca71 100644 (file)
--- a/git-send-email.txt
+++ b/git-send-email.txt
@@ -96,11 +96,40 @@ The --cc option must be repeated for each user you want on the cc list.
        servers typically listen to smtp port 25 and ssmtp port
        465).
 
---smtp-user, --smtp-pass::
-       Username and password for SMTP-AUTH. Defaults are the values of
-       the configuration values 'sendemail.smtpuser' and
-       'sendemail.smtppass', but see also 'sendemail.identity'.
-       If not set, authentication is not attempted.
+--smtp-user::
+       Username for SMTP-AUTH. In place of this option, the following
+       configuration variables can be specified:
++
+--
+               * sendemail.smtpuser
+               * sendemail.<identity>.smtpuser (see sendemail.identity).
+--
++
+However, --smtp-user always overrides these variables.
++
+If a username is not specified (with --smtp-user or a
+configuration variable), then authentication is not attempted.
+
+--smtp-pass::
+       Password for SMTP-AUTH. The argument is optional: If no
+       argument is specified, then the empty string is used as
+       the password.
++
+In place of this option, the following configuration variables
+can be specified:
++
+--
+               * sendemail.smtppass
+               * sendemail.<identity>.smtppass (see sendemail.identity).
+--
++
+However, --smtp-pass always overrides these variables.
++
+Furthermore, passwords need not be specified in configuration files
+or on the command line. If a username has been specified (with
+--smtp-user or a configuration variable), but no password has been
+specified (with --smtp-pass or a configuration variable), then the
+user is prompted for a password while the input is masked for privacy.
 
 --smtp-ssl::
        If set, connects to the SMTP server using SSL.
@@ -117,6 +146,17 @@ The --cc option must be repeated for each user you want on the cc list.
         Default is the value of 'sendemail.suppressfrom' configuration value;
         if that is unspecified, default to --no-suppress-from.
 
+--suppress-cc::
+       Specify an additional category of recipients to suppress the
+       auto-cc of.  'self' will avoid including the sender, 'author' will
+       avoid including the patch author, 'cc' will avoid including anyone
+       mentioned in Cc lines in the patch, 'sob' will avoid including
+       anyone mentioned in Signed-off-by lines, and 'cccmd' will avoid
+       running the --cc-cmd.  'all' will suppress all auto cc values.
+       Default is the value of 'sendemail.suppresscc' configuration value;
+       if that is unspecified, default to 'self' if --suppress-from is
+       specified, as well as 'sob' if --no-signed-off-cc is specified.
+
 --thread, --no-thread::
        If this is set, the In-Reply-To header will be set on each email sent.
        If disabled with "--no-thread", no emails will have the In-Reply-To

diff --git a/git-svn.html b/git-svn.html
index 486ec0a8ad9d0d10a2cba7ed756df2b70d084f27..dca6f71bef925335ab9e44e17d02c47b57e5d654 100644 (file)
--- a/git-svn.html
+++ b/git-svn.html
@@ -555,6 +555,17 @@ and have no uncommitted changes.</p>
 </dl>\r
 <p>Any other arguments are passed directly to `git log'</p>\r
 </dd>\r
+<dt>\r
+<em>blame</em>\r
+</dt>\r
+<dd>\r
+<p>\r
+       Show what revision and author last modified each line of a file. This is\r
+       identical to `git blame', but SVN revision numbers are shown instead of git\r
+       commit hashes.\r
+</p>\r
+<p>All arguments are passed directly to `git blame'.</p>\r
+</dd>\r
 </dl>\r
 <dl>\r
 <dt>\r
@@ -1074,7 +1085,7 @@ should be manually entered with a text-editor or using
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 27-Jan-2008 08:23:29 UTC\r
+Last updated 12-Feb-2008 03:18:07 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-svn.txt b/git-svn.txt
index b1d527f74cd72a7c749f1067a91a6d2c6b6235d3..340f1be02a21495182584b0c09512a8608c1a61a 100644 (file)
--- a/git-svn.txt
+++ b/git-svn.txt
@@ -161,6 +161,13 @@ New features:
 +
 Any other arguments are passed directly to `git log'
 
+'blame'::
+       Show what revision and author last modified each line of a file. This is
+       identical to `git blame', but SVN revision numbers are shown instead of git
+       commit hashes.
++
+All arguments are passed directly to `git blame'.
+
 --
 'find-rev'::
        When given an SVN revision number of the form 'rN', returns the