Autogenerated HTML docs for v1.5.2-58-g98ee

diff --git a/config.txt b/config.txt
index 179cb177d1e3b0a7a969874dde059bf2f9a7266e..3d8f03dfe54f5aff199f04b1bf1992d9b75916fa 100644 (file)
--- a/config.txt
+++ b/config.txt
@@ -280,6 +280,13 @@ apply.whitespace::
        Tells `git-apply` how to handle whitespaces, in the same way
        as the '--whitespace' option. See gitlink:git-apply[1].
 
+branch.autosetupmerge::
+       Tells `git-branch` and `git-checkout` to setup new branches
+       so that gitlink: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.
+
 branch.<name>.remote::
        When in branch <name>, it tells `git fetch` which remote to fetch.
        If this option is not given, `git fetch` defaults to remote "origin".

diff --git a/git-config.html b/git-config.html
index a13d1c4f263c9c68545ee8b01ecd319cd31c2d2d..fa978c771f71adfaa8df89e1da63b9bf7b107bc7 100644 (file)
--- a/git-config.html
+++ b/git-config.html
@@ -944,6 +944,18 @@ apply.whitespace
 </p>\r
 </dd>\r
 <dt>\r
+branch.autosetupmerge\r
+</dt>\r
+<dd>\r
+<p>\r
+        Tells <tt>git-branch</tt> and <tt>git-checkout</tt> to setup new branches\r
+        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
+</p>\r
+</dd>\r
+<dt>\r
 branch.&lt;name&gt;.remote\r
 </dt>\r
 <dd>\r
@@ -1690,7 +1702,7 @@ transfer.unpackLimit
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 22-May-2007 07:23:05 UTC\r
+Last updated 24-May-2007 06:59:45 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-ls-tree.html b/git-ls-tree.html
index 914b1132553daf42bbf13d3832f276efaa25afa7..07c521ac27436b3940d8792c25c5d1a687914e63 100644 (file)
--- a/git-ls-tree.html
+++ b/git-ls-tree.html
@@ -273,7 +273,7 @@ git-ls-tree(1) Manual Page
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
 <div class="verseblock">\r
-<div class="content"><em>git-ls-tree</em> [-d] [-r] [-t] [-z]\r
+<div class="content"><em>git-ls-tree</em> [-d] [-r] [-t] [-l] [-z]\r
             [--name-only] [--name-status] [--full-name] [--abbrev=[&lt;n&gt;]]\r
             &lt;tree-ish&gt; [paths&#8230;]</div></div>\r
 </div>\r
@@ -322,6 +322,17 @@ arguments does not matter.</p>
 </p>\r
 </dd>\r
 <dt>\r
+-l\r
+</dt>\r
+<dt>\r
+--long\r
+</dt>\r
+<dd>\r
+<p>\r
+        Show object size of blob (file) entries.\r
+</p>\r
+</dd>\r
+<dt>\r
 -z\r
 </dt>\r
 <dd>\r
@@ -379,6 +390,14 @@ paths
 </div></div>\r
 <p>When the <tt>-z</tt> option is not used, TAB, LF, and backslash characters\r
 in pathnames are represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>, respectively.</p>\r
+<p>When the <tt>-l</tt> option is used, format changes to</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>&lt;mode&gt; SP &lt;type&gt; SP &lt;object&gt; SP &lt;object size&gt; TAB &lt;file&gt;</tt></pre>\r
+</div></div>\r
+<p>Object size identified by &lt;object&gt; is given in bytes, and right-justified\r
+with minimum width of 7 characters.  Object size is given only for blobs\r
+(file) entries; for other entries <tt>-</tt> character is used in place of size.</p>\r
 </div>\r
 <h2>Author</h2>\r
 <div class="sectionbody">\r
@@ -397,7 +416,7 @@ another major rewrite by Linus Torvalds &lt;torvalds@osdl.org&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:49 UTC\r
+Last updated 23-May-2007 21:46:09 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-ls-tree.txt b/git-ls-tree.txt
index 78993940811c96752e87f7b9e7c1381066056950..ad7f1b9202c414a47573864a320ca766a147753e 100644 (file)
--- a/git-ls-tree.txt
+++ b/git-ls-tree.txt
@@ -9,7 +9,7 @@ git-ls-tree - List the contents of a tree object
 SYNOPSIS
 --------
 [verse]
-'git-ls-tree' [-d] [-r] [-t] [-z]
+'git-ls-tree' [-d] [-r] [-t] [-l] [-z]
            [--name-only] [--name-status] [--full-name] [--abbrev=[<n>]]
            <tree-ish> [paths...]
 
@@ -36,6 +36,10 @@ OPTIONS
        Show tree entries even when going to recurse them. Has no effect
        if '-r' was not passed. '-d' implies '-t'.
 
+-l::
+--long::
+       Show object size of blob (file) entries.
+
 -z::
        \0 line termination on output.
 
@@ -65,6 +69,14 @@ Output Format
 When the `-z` option is not used, TAB, LF, and backslash characters
 in pathnames are represented as `\t`, `\n`, and `\\`, respectively.
 
+When the `-l` option is used, format changes to
+
+        <mode> SP <type> SP <object> SP <object size> TAB <file>
+
+Object size identified by <object> is given in bytes, and right-justified
+with minimum width of 7 characters.  Object size is given only for blobs
+(file) entries; for other entries `-` character is used in place of size.
+
 
 Author
 ------