Autogenerated HTML docs for v1.5.3-rc1

diff --git a/RelNotes-1.5.2.4.txt b/RelNotes-1.5.2.4.txt
new file mode 100644 (file)
index 0000000..75cff47
--- /dev/null
+++ b/RelNotes-1.5.2.4.txt
@@ -0,0 +1,28 @@
+GIT v1.5.2.4 Release Notes
+==========================
+
+Fixes since v1.5.2.3
+--------------------
+
+ * Bugfixes
+
+   - "git-gui" bugfixes, including a handful fixes to run it
+     better on Cygwin/MSYS.
+
+   - "git checkout" failed to switch back and forth between
+     branches, one of which has "frotz -> xyzzy" symlink and
+     file "xyzzy/filfre", while the other one has a file
+     "frotz/filfre".
+
+   - "git prune" used to segfault upon seeing a commit that is
+     referred to by a tree object (aka "subproject").
+
+   - "git diff --name-status --no-index" mishandled an added file.
+
+   - "git apply --reverse --whitespace=warn" still complained
+     about whitespaces that a forward application would have
+     introduced.
+
+ * Documentation Fixes and Updates
+
+   - A handful documentation updates.

diff --git a/RelNotes-1.5.3.txt b/RelNotes-1.5.3.txt
index e2e809e3c8e700dc23ed7c95a2f2c2fa8ff2f708..63e33b9d279f4f434b7772c7860a3915287aa9c1 100644 (file)
--- a/RelNotes-1.5.3.txt
+++ b/RelNotes-1.5.3.txt
@@ -21,6 +21,9 @@ Updates since v1.5.2
 
 * New commands and options.
 
+  - The hunk header output from "git diff" family can be customized
+    with the attributes mechanism.  See gitattributes(5) for details.
+
   - "git stash" allows you to quickly save away your work in
     progress and replay it later on an updated state.
 
@@ -184,6 +187,11 @@ Updates since v1.5.2
     small enough delta results it creates while looking for the
     best delta candidates.
 
+  - git-pack-objects learned a new heuristcs to prefer delta
+    that is shallower in depth over the smallest delta
+    possible.  This improves both overall packfile access
+    performance and packfile density.
+
   - diff-delta code that is used for packing has been improved
     to work better on big files.
 
@@ -210,6 +218,6 @@ this release, unless otherwise noted.
 
 --
 exec >/var/tmp/1
-O=v1.5.3-rc0
+O=v1.5.3-rc1
 echo O=`git describe refs/heads/master`
 git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint

diff --git a/config.txt b/config.txt
index 4b67f0adf721d540ddd437254de4aa069f1be0ae..11b332117c7abbdf3c4239843672d394578f8f0a 100644 (file)
--- a/config.txt
+++ b/config.txt
@@ -589,6 +589,12 @@ pack.depth::
        The maximum delta depth used by gitlink:git-pack-objects[1] when no
        maximum depth is given on the command line. Defaults to 50.
 
+pack.windowMemory::
+       The window memory size limit used by gitlink:git-pack-objects[1]
+       when no limit is given on the command line.  The value can be
+       suffixed with "k", "m", or "g".  Defaults to 0, meaning no
+       limit.
+
 pack.compression::
        An integer -1..9, indicating the compression level for objects
        in a pack file. -1 is the zlib default. 0 means no

diff --git a/git-config.html b/git-config.html
index f931bb5cbf2e5a2953e3ffa5b8caed33304fcf31..cd9c454958a0fba64c6c82a1f59fd86a2294228a 100644 (file)
--- a/git-config.html
+++ b/git-config.html
@@ -1577,6 +1577,17 @@ pack.depth
 </p>\r
 </dd>\r
 <dt>\r
+pack.windowMemory\r
+</dt>\r
+<dd>\r
+<p>\r
+        The window memory size limit used by <a href="git-pack-objects.html">git-pack-objects(1)</a>\r
+        when no limit is given on the command line.  The value can be\r
+        suffixed with "k", "m", or "g".  Defaults to 0, meaning no\r
+        limit.\r
+</p>\r
+</dd>\r
+<dt>\r
 pack.compression\r
 </dt>\r
 <dd>\r
@@ -1839,7 +1850,7 @@ transfer.unpackLimit
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 12-Jul-2007 06:45:15 UTC\r
+Last updated 13-Jul-2007 00:24:26 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-log.html b/git-log.html
index 63b22ef922921f75c454d070f1fd63f8a3abb532..a5dfef5a568740feb92b7a8af778f3d6becb197b 100644 (file)
--- a/git-log.html
+++ b/git-log.html
@@ -392,6 +392,14 @@ people using 80-column terminals.</p>
 </p>\r
 </dd>\r
 <dt>\r
+--follow\r
+</dt>\r
+<dd>\r
+<p>\r
+        Continue listing the history of a file beyond renames.\r
+</p>\r
+</dd>\r
+<dt>\r
 &lt;paths&gt;&#8230;\r
 </dt>\r
 <dd>\r
@@ -721,6 +729,16 @@ git log -r --name-status release..test
         each commit modifies.\r
 </p>\r
 </dd>\r
+<dt>\r
+git log --follow builtin-rev-list.c\r
+</dt>\r
+<dd>\r
+<p>\r
+        Shows the commits that changed builtin-rev-list.c, including\r
+        those commits that occurred before the file was given its\r
+        present name.\r
+</p>\r
+</dd>\r
 </dl>\r
 </div>\r
 <h2>Discussion</h2>\r
@@ -812,7 +830,7 @@ reversible operation.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 21-Jun-2007 00:34:59 UTC\r
+Last updated 13-Jul-2007 00:24:26 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-log.txt b/git-log.txt
index 7adcdefacfd681729317c59ebacfd4a27db1effd..63c1dbe812e6078870569c0b8d03ff021e4b56a3 100644 (file)
--- a/git-log.txt
+++ b/git-log.txt
@@ -61,6 +61,9 @@ include::pretty-options.txt[]
        the specified paths; this means that "<paths>..." limits only
        commits, and doesn't limit diff for those commits.
 
+--follow::
+       Continue listing the history of a file beyond renames.
+
 <paths>...::
        Show only commits that affect the specified paths.
 
@@ -91,6 +94,12 @@ git log -r --name-status release..test::
        in the "release" branch, along with the list of paths
        each commit modifies.
 
+git log --follow builtin-rev-list.c::
+
+       Shows the commits that changed builtin-rev-list.c, including
+       those commits that occurred before the file was given its
+       present name.
+
 Discussion
 ----------
 

diff --git a/git-pack-objects.html b/git-pack-objects.html
index fd8b144b31acf0abf7dcef69296445bb6dab7bd5..0cc119b899e4288a770844195c7459f0d0f8c001 100644 (file)
--- a/git-pack-objects.html
+++ b/git-pack-objects.html
@@ -375,6 +375,22 @@ base-name
 </p>\r
 </dd>\r
 <dt>\r
+--window-memory=[N]\r
+</dt>\r
+<dd>\r
+<p>\r
+        This option provides an additional limit on top of <tt>--window</tt>;\r
+        the window size will dynamically scale down so as to not take\r
+        up more than N bytes in memory.  This is useful in\r
+        repositories with a mix of large and small objects to not run\r
+        out of memory with a large window, but still be able to take\r
+        advantage of the large window for the smaller objects.  The\r
+        size can be suffixed with "k", "m", or "g".\r
+        <tt>--window-memory=0</tt> makes memory usage unlimited, which is the\r
+        default.\r
+</p>\r
+</dd>\r
+<dt>\r
 --max-pack-size=&lt;n&gt;\r
 </dt>\r
 <dd>\r
@@ -538,7 +554,7 @@ base-name
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 16-Jun-2007 09:49:14 UTC\r
+Last updated 13-Jul-2007 00:24:27 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-pack-objects.txt b/git-pack-objects.txt
index e3549b50442bea1734812ec40331adb7e3d41ef7..6f17cff24ab784ee68767724dff6892b67b3ad53 100644 (file)
--- a/git-pack-objects.txt
+++ b/git-pack-objects.txt
@@ -85,6 +85,17 @@ base-name::
        times to get to the necessary object.
        The default value for --window is 10 and --depth is 50.
 
+--window-memory=[N]::
+       This option provides an additional limit on top of `--window`;
+       the window size will dynamically scale down so as to not take
+       up more than N bytes in memory.  This is useful in
+       repositories with a mix of large and small objects to not run
+       out of memory with a large window, but still be able to take
+       advantage of the large window for the smaller objects.  The
+       size can be suffixed with "k", "m", or "g".
+       `--window-memory=0` makes memory usage unlimited, which is the
+       default.
+
 --max-pack-size=<n>::
        Maximum size of each output packfile, expressed in MiB.
        If specified,  multiple packfiles may be created.

diff --git a/git-repack.html b/git-repack.html
index b88acd511c8af97fb2da0205387e01bf3fbee41d..b7a6290c1b19a54fcf76b1c0cc8784bef013392b 100644 (file)
--- a/git-repack.html
+++ b/git-repack.html
@@ -365,6 +365,22 @@ engines, disk storage, etc.</p>
 </p>\r
 </dd>\r
 <dt>\r
+--window-memory=[N]\r
+</dt>\r
+<dd>\r
+<p>\r
+        This option provides an additional limit on top of <tt>--window</tt>;\r
+        the window size will dynamically scale down so as to not take\r
+        up more than N bytes in memory.  This is useful in\r
+        repositories with a mix of large and small objects to not run\r
+        out of memory with a large window, but still be able to take\r
+        advantage of the large window for the smaller objects.  The\r
+        size can be suffixed with "k", "m", or "g".\r
+        <tt>--window-memory=0</tt> makes memory usage unlimited, which is the\r
+        default.\r
+</p>\r
+</dd>\r
+<dt>\r
 --max-pack-size=&lt;n&gt;\r
 </dt>\r
 <dd>\r
@@ -407,7 +423,7 @@ that way can try to use older git with it).</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 01-Jul-2007 06:34:00 UTC\r
+Last updated 13-Jul-2007 00:24:27 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-repack.txt b/git-repack.txt
index 28949397ca7434471f1e9c1552ecae1ade9b8313..5283ef84a9f4083b1c79316286c3278679a41699 100644 (file)
--- a/git-repack.txt
+++ b/git-repack.txt
@@ -68,6 +68,17 @@ OPTIONS
        to be applied that many times to get to the necessary object.
        The default value for --window is 10 and --depth is 50.
 
+--window-memory=[N]::
+       This option provides an additional limit on top of `--window`;
+       the window size will dynamically scale down so as to not take
+       up more than N bytes in memory.  This is useful in
+       repositories with a mix of large and small objects to not run
+       out of memory with a large window, but still be able to take
+       advantage of the large window for the smaller objects.  The
+       size can be suffixed with "k", "m", or "g".
+       `--window-memory=0` makes memory usage unlimited, which is the
+       default.
+
 --max-pack-size=<n>::
        Maximum size of each output packfile, expressed in MiB.
        If specified,  multiple packfiles may be created.

diff --git a/git.html b/git.html
index b55f52c09789c0b264d6a93380fc4b4f4108ab92..12d19397b513bd8771c4ed95bd30c0607b59fdc0 100644 (file)
--- a/git.html
+++ b/git.html
@@ -2398,7 +2398,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 07-Jul-2007 21:52:21 UTC\r
+Last updated 13-Jul-2007 00:24:28 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git.txt b/git.txt
index 10c7bb3f459cedfadf64fcb99114ceaf6b961358..33614ec0502dcbbadb2f067398e8b02af7cec77f 100644 (file)
--- a/git.txt
+++ b/git.txt
@@ -42,9 +42,10 @@ unreleased) version of git, that is available from 'master'
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 
-* link:v1.5.2.3/git.html[documentation for release 1.5.2.3]
+* link:v1.5.2.4/git.html[documentation for release 1.5.2.4]
 
 * release notes for
+  link:RelNotes-1.5.2.4.txt[1.5.2.4],
   link:RelNotes-1.5.2.3.txt[1.5.2.3],
   link:RelNotes-1.5.2.2.txt[1.5.2.2],
   link:RelNotes-1.5.2.1.txt[1.5.2.1],