From 235d53f227234a5905682cc55d59adcc6369c48c Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 13 Jul 2007 00:25:15 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.3-rc1 --- RelNotes-1.5.2.4.txt | 28 ++++++++++++++++++++++++++++ RelNotes-1.5.3.txt | 10 +++++++++- config.txt | 6 ++++++ git-config.html | 13 ++++++++++++- git-log.html | 20 +++++++++++++++++++- git-log.txt | 9 +++++++++ git-pack-objects.html | 18 +++++++++++++++++- git-pack-objects.txt | 11 +++++++++++ git-repack.html | 18 +++++++++++++++++- git-repack.txt | 11 +++++++++++ git.html | 2 +- git.txt | 3 ++- 12 files changed, 142 insertions(+), 7 deletions(-) create mode 100644 RelNotes-1.5.2.4.txt diff --git a/RelNotes-1.5.2.4.txt b/RelNotes-1.5.2.4.txt new file mode 100644 index 000000000..75cff475f --- /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 e2e809e3c..63e33b9d2 100644 --- 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 4b67f0adf..11b332117 100644 --- 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 f931bb5cb..cd9c45495 100644 --- a/git-config.html +++ b/git-config.html @@ -1577,6 +1577,17 @@ pack.depth

+pack.windowMemory +
+
+

+ The window memory size limit used by 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
@@ -1839,7 +1850,7 @@ transfer.unpackLimit diff --git a/git-log.html b/git-log.html index 63b22ef92..a5dfef5a5 100644 --- a/git-log.html +++ b/git-log.html @@ -392,6 +392,14 @@ people using 80-column terminals.

+--follow +
+
+

+ Continue listing the history of a file beyond renames. +

+
+
<paths>…
@@ -721,6 +729,16 @@ git log -r --name-status release..test 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

@@ -812,7 +830,7 @@ reversible operation.

diff --git a/git-log.txt b/git-log.txt index 7adcdefac..63c1dbe81 100644 --- a/git-log.txt +++ b/git-log.txt @@ -61,6 +61,9 @@ include::pretty-options.txt[] the specified paths; this means that "..." limits only commits, and doesn't limit diff for those commits. +--follow:: + Continue listing the history of a file beyond renames. + ...:: 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 fd8b144b3..0cc119b89 100644 --- a/git-pack-objects.html +++ b/git-pack-objects.html @@ -375,6 +375,22 @@ base-name

+--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>
@@ -538,7 +554,7 @@ base-name diff --git a/git-pack-objects.txt b/git-pack-objects.txt index e3549b504..6f17cff24 100644 --- 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=:: 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 b88acd511..b7a6290c1 100644 --- a/git-repack.html +++ b/git-repack.html @@ -365,6 +365,22 @@ engines, disk storage, etc.

+--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>
@@ -407,7 +423,7 @@ that way can try to use older git with it).

diff --git a/git-repack.txt b/git-repack.txt index 28949397c..5283ef84a 100644 --- 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=:: 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 b55f52c09..12d19397b 100644 --- a/git.html +++ b/git.html @@ -2398,7 +2398,7 @@ contributors on the git-list <git@vger.kernel.org>.

diff --git a/git.txt b/git.txt index 10c7bb3f4..33614ec05 100644 --- 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], -- 2.26.2