Autogenerated HTML docs for v1.5.1-rc1

diff --git a/RelNotes-1.5.1.txt b/RelNotes-1.5.1.txt
index f374e1c2c75a597c15a9f0bbb2ff2fec6ec190df..f78cf56bc8563681ab8851e88dd6158eabe98a9d 100644 (file)
--- a/RelNotes-1.5.1.txt
+++ b/RelNotes-1.5.1.txt
@@ -25,6 +25,21 @@ Updates since v1.5.0
   - "git diff --pretty=format:<string>" to allow more flexible
     custom log output.
 
+  - "git diff --no-index" can read from '-' (standard input).
+
+  - "git diff" also learned --exit-code to exit with non-zero
+    status when it found differences.  In the future we might
+    want to make this the default but that would be a rather big
+    backward incompatible change; it will stay as an option for
+    now.
+
+  - "git branch --track" can be used to set up configuration
+    variables to help it easier to base your work on branches
+    you track from a remote site.
+
+  - "git format-patch --attach" now emits attachments.  Use
+    --inline to get an inlined multipart/mixed.
+
   - "git name-rev" learned --refs=<pattern>, to limit the tags
     used for naming the given revisions only to the ones
     matching the given pattern.
@@ -39,6 +54,9 @@ Updates since v1.5.0
   - "git bundle" can help sneaker-netting your changes between
     repositories.
 
+  - "git mergetool" can help 3-way file-level conflict
+    resolution with your favorite graphical merge tools.
+
   - A new configuration "core.symlinks" can be used to disable
     symlinks on filesystems that do not support them; they are
     checked out as regular files instead.
@@ -46,6 +64,11 @@ Updates since v1.5.0
 
 * Updated behaviour of existing commands.
 
+  - "git fsck" does not barf on corrupt loose objects.
+
+  - "git archimport" allows remapping when coming up with git
+    branch names from arch names.
+
   - git-svn got almost a rewrite.
 
   - core.autocrlf configuration, when set to 'true', makes git
@@ -99,6 +122,25 @@ Updates since v1.5.0
   - "git fetch" (hence "git clone" and "git pull") are less
     noisy when the output does not go to tty.
 
+  - "git fetch" between repositories with many refs were slow
+    even when there are not many changes that needed
+    transferring.  This has been sped up by partially rewriting
+    the heaviest parts in C.
+
+  - "git mailinfo" which splits an e-mail into a patch and the
+    metainformation was rewritten, thanks to Don Zickus.  It
+    handles nested multipart better.
+
+  - send-email learned configurable bcc and chain-reply-to.
+
+  - Using objects from packs is now seriouly optimized by clever
+    use of a cache.  This should be most noticeable in git-log
+    family of commands that involve reading many tree objects.
+    In addition, traversing revisions while filtering changes
+    with pathspecs is made faster by terminating the comparison
+    between the trees as early as possible.
+
+
 * Hooks
 
   - The sample update hook to show how to send out notification
@@ -106,9 +148,15 @@ Updates since v1.5.0
     the repository.  Earlier, it showed new commits that appeared
     on the branch.
 
+
+* Others
+
+  - git-revert, git-gc and git-cherry-pick are now built-ins.
+
+
 --
 exec >/var/tmp/1
-O=v1.5.0.3-268-g3ddad98
+O=v1.5.0.5-446-g5d86501
 echo O=`git describe master`
 git shortlog --no-merges $O..master ^maint
 

diff --git a/config.txt b/config.txt
index 953acaee4c9b692802a4e98861dac8ceec315d54..cf1e040381a99ed458dc061fe103e3c2d2c9474c 100644 (file)
--- a/config.txt
+++ b/config.txt
@@ -240,6 +240,19 @@ the largest projects.  You probably do not need to adjust this value.
 +
 Common unit suffixes of 'k', 'm', or 'g' are supported.
 
+core.deltaBaseCacheLimit::
+       Maximum number of bytes to reserve for caching base objects
+       that multiple deltafied objects reference.  By storing the
+       entire decompressed base objects in a cache Git is able
+       to avoid unpacking and decompressing frequently used base
+       objects multiple times.
++
+Default is 16 MiB on all platforms.  This should be reasonable
+for all users/operating systems, except on the largest projects.
+You probably do not need to adjust this value.
++
+Common unit suffixes of 'k', 'm', or 'g' are supported.
+
 alias.*::
        Command aliases for the gitlink:git[1] command wrapper - e.g.
        after defining "alias.last = cat-file commit HEAD", the invocation
@@ -460,7 +473,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"
+       "meld", "xxdiff", "emerge", "vimdiff"
 
 merge.verbosity::
        Controls the amount of output shown by the recursive merge

diff --git a/git-config.html b/git-config.html
index ba6802199d7368ddbe3ac85b3659c984a7b85ede..2b544144b63d85969ba84291a363dba4cdb6c8a1 100644 (file)
--- a/git-config.html
+++ b/git-config.html
@@ -868,6 +868,22 @@ the largest projects.  You probably do not need to adjust this value.</p>
 <p>Common unit suffixes of <em>k</em>, <em>m</em>, or <em>g</em> are supported.</p>\r
 </dd>\r
 <dt>\r
+core.deltaBaseCacheLimit\r
+</dt>\r
+<dd>\r
+<p>\r
+        Maximum number of bytes to reserve for caching base objects\r
+        that multiple deltafied objects reference.  By storing the\r
+        entire decompressed base objects in a cache Git is able\r
+        to avoid unpacking and decompressing frequently used base\r
+        objects multiple times.\r
+</p>\r
+<p>Default is 16 MiB on all platforms.  This should be reasonable\r
+for all users/operating systems, except on the largest projects.\r
+You probably do not need to adjust this value.</p>\r
+<p>Common unit suffixes of <em>k</em>, <em>m</em>, or <em>g</em> are supported.</p>\r
+</dd>\r
+<dt>\r
 alias.*\r
 </dt>\r
 <dd>\r
@@ -1267,7 +1283,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"\r
+        "meld", "xxdiff", "emerge", "vimdiff"\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -1523,7 +1539,7 @@ transfer.unpackLimit
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 16-Mar-2007 10:20:49 UTC\r
+Last updated 19-Mar-2007 10:43:12 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-mergetool.html b/git-mergetool.html
index a27739749d6f5b673b4be368d5e38b06fdc6119b..32065ec25a330dbf0dd9f307bf41018fb0449ce7 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, and emerge.\r
+        kdiff3, tkdiff, meld, xxdiff, emerge, and vimdiff.\r
 </p>\r
 <div class="literalblock">\r
 <div class="content">\r
@@ -319,7 +319,7 @@ will pick a suitable default.</tt></pre>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 14-Mar-2007 11:19:12 UTC\r
+Last updated 19-Mar-2007 10:43:14 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-mergetool.txt b/git-mergetool.txt
index ae69a0eb83ea705b2564c5ed8d3f2ff1313ae8fd..5baaaca0b5433ae279b3961d72d0cffa8ca046e3 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, and emerge.
+       kdiff3, tkdiff, meld, xxdiff, emerge, and vimdiff.
 
        If a merge resolution program is not specified, 'git mergetool'
        will use the configuration variable merge.tool.  If the

diff --git a/git-send-email.html b/git-send-email.html
index e05b0b9d064745fcd2eadd802531ca6572de3861..6ad0c21d9507d31d3c627638ff76278be7ab14a9 100644 (file)
--- a/git-send-email.html
+++ b/git-send-email.html
@@ -353,7 +353,8 @@ enabled interface to provide the necessary information.</p>
 </dt>\r
 <dd>\r
 <p>\r
-        Do not add emails found in Signed-off-by: lines to the cc list.\r
+        Do not add emails found in Signed-off-by: or Cc: lines to the\r
+        cc list.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -475,7 +476,7 @@ send_lots_of_email.pl by Greg Kroah-Hartman.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 12-Mar-2007 07:28:56 UTC\r
+Last updated 19-Mar-2007 10:43:14 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-send-email.txt b/git-send-email.txt
index 9b3aabb6fe5590f41319298337e8f9ea6d9fff4e..682313e95dc9b96d3cc14f33554ad82bcede9a56 100644 (file)
--- a/git-send-email.txt
+++ b/git-send-email.txt
@@ -60,7 +60,8 @@ The --cc option must be repeated for each user you want on the cc list.
        is not set, this will be prompted for.
 
 --no-signed-off-by-cc::
-       Do not add emails found in Signed-off-by: lines to the cc list.
+       Do not add emails found in Signed-off-by: or Cc: lines to the
+       cc list.
 
 --quiet::
        Make git-send-email less verbose.  One line per email should be

diff --git a/git.html b/git.html
index ca8b5177d63ef690a1fc9e1fd5dc3251ec4814f8..4a0a1b6bd75395686ebf07985b9fb4bf28e328d4 100644 (file)
--- a/git.html
+++ b/git.html
@@ -2317,7 +2317,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 19-Mar-2007 02:02:14 UTC\r
+Last updated 19-Mar-2007 10:43:14 UTC\r
 </div>\r
 </div>\r
 </body>\r