From 91d44c573c59f25cccb2611879c9eab49c55c2bb Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 9 May 2007 07:16:07 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.2-rc2-46-g4675 --- RelNotes-1.5.1.4.txt | 30 ++++++++++++++++++++++++++++++ RelNotes-1.5.2.txt | 20 ++++++++++++++++++-- config.txt | 4 ++++ git-config.html | 11 ++++++++++- git-pack-objects.html | 4 ++-- git-pack-objects.txt | 2 +- git-repack.html | 4 ++-- git-repack.txt | 2 +- git.html | 2 +- git.txt | 6 +++++- user-manual.html | 11 +++++------ user-manual.txt | 13 ++++++------- 12 files changed, 85 insertions(+), 24 deletions(-) create mode 100644 RelNotes-1.5.1.4.txt diff --git a/RelNotes-1.5.1.4.txt b/RelNotes-1.5.1.4.txt new file mode 100644 index 000000000..df2f66ccb --- /dev/null +++ b/RelNotes-1.5.1.4.txt @@ -0,0 +1,30 @@ +GIT v1.5.1.4 Release Notes +========================== + +Fixes since v1.5.1.3 +-------------------- + +* Bugfixes + + - "git-http-fetch" did not work around a bug in libcurl + earlier than 7.16 (curl_multi_remove_handle() was broken). + + - "git cvsserver" handles a file that was once removed and + then added again correctly. + + - import-tars script (in contrib/) handles GNU tar archives + that contain pathnames longer than 100 bytes (long-link + extension) correctly. + + - xdelta test program did not build correctly. + + - gitweb sometimes tried incorrectly to apply function to + decode utf8 twice, resulting in corrupt output. + + - "git blame -C" mishandled text at the end of a group of + lines. + + - "git log/rev-list --boundary" did not produce output + correctly without --left-right option. + + - Many documentation updates. diff --git a/RelNotes-1.5.2.txt b/RelNotes-1.5.2.txt index 02b8ea0a6..c14f3da7a 100644 --- a/RelNotes-1.5.2.txt +++ b/RelNotes-1.5.2.txt @@ -32,7 +32,7 @@ Updates since v1.5.1 arbitrary filter to contents on check-in/check-out codepath but this feature is an extremely sharp-edged razor and needs to be handled with caution (do not use it unless you - understand the earlier mailing list discussion on keyward + understand the earlier mailing list discussion on keyword expansion). * The packfile format now optionally suports 64-bit index. @@ -42,6 +42,8 @@ Updates since v1.5.1 needs more than 32-bit to express offsets of objects in the pack +* Comes with an updated git-gui 0.7.0 + * New commands and options. - "git bisect start" can optionally take a single bad commit and @@ -112,6 +114,13 @@ Updates since v1.5.1 - "git blame" uses .mailmap to canonicalize the author name just like "git shortlog" does. + - "git pack-objects" pays attention to pack.depth + configuration variable. + + - "git cherry-pick" and "git revert" does not use .msg file in + the working tree to prepare commit message; instead it uses + $GIT_DIR/MERGE_MSG as other commands. + * Builds - git-p4import has never been installed; now there is an @@ -137,6 +146,11 @@ Updates since v1.5.1 renamed it. We do not do that when there is no rename, so match that behaviour. + - The default pack depth has been increased to 50, as the + recent addition of delta_base_cache makes deeper delta chains + much less expensive to access. + + Fixes since v1.5.1 ------------------ @@ -165,12 +179,14 @@ this release, unless otherwise noted. - git-fetch had trouble with a remote with insanely large number of refs. + - "git clean -d -X" now does not remove non-excluded directories. + * Documentation updates * Performance Tweaks -- exec >/var/tmp/1 -O=v1.5.2-rc1-32-g125a5f1 +O=v1.5.2-rc2-45-g618e613 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 24f9655fe..ea434af9d 100644 --- a/config.txt +++ b/config.txt @@ -546,6 +546,10 @@ pack.window:: The size of the window used by gitlink:git-pack-objects[1] when no window size is given on the command line. Defaults to 10. +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. + pull.octopus:: The default merge strategy to use when pulling multiple branches at once. diff --git a/git-config.html b/git-config.html index 74bccbfc6..9251753c0 100644 --- a/git-config.html +++ b/git-config.html @@ -1423,6 +1423,15 @@ pack.window

+pack.depth +
+
+

+ The maximum delta depth used by git-pack-objects(1) when no + maximum depth is given on the command line. Defaults to 50. +

+
+
pull.octopus
@@ -1654,7 +1663,7 @@ transfer.unpackLimit diff --git a/git-pack-objects.html b/git-pack-objects.html index dc1fd8ef5..43b081f9e 100644 --- a/git-pack-objects.html +++ b/git-pack-objects.html @@ -371,7 +371,7 @@ base-name it too deep affects the performance on the unpacker side, because delta data needs to be applied that many times to get to the necessary object. - The default value for both --window and --depth is 10. + The default value for --window is 10 and --depth is 50.

@@ -499,7 +499,7 @@ base-name diff --git a/git-pack-objects.txt b/git-pack-objects.txt index d9e11c653..bd3ee456e 100644 --- a/git-pack-objects.txt +++ b/git-pack-objects.txt @@ -83,7 +83,7 @@ base-name:: it too deep affects the performance on the unpacker side, because delta data needs to be applied that many times to get to the necessary object. - The default value for both --window and --depth is 10. + The default value for --window is 10 and --depth is 50. --incremental:: This flag causes an object already in a pack ignored diff --git a/git-repack.html b/git-repack.html index 345f17f0d..9aecf8e4d 100644 --- a/git-repack.html +++ b/git-repack.html @@ -358,7 +358,7 @@ engines, disk storage, etc.

space. --depth limits the maximum delta depth; making it too deep affects the performance on the unpacker side, because delta data needs to be applied that many times to get to the necessary object. - The default value for both --window and --depth is 10. + The default value for --window is 10 and --depth is 50.

@@ -394,7 +394,7 @@ that way can try to use older git with it).

diff --git a/git-repack.txt b/git-repack.txt index d39abc126..cc3b0b21c 100644 --- a/git-repack.txt +++ b/git-repack.txt @@ -63,7 +63,7 @@ OPTIONS space. `--depth` limits the maximum delta depth; making it too deep affects the performance on the unpacker side, because delta data needs to be applied that many times to get to the necessary object. - The default value for both --window and --depth is 10. + The default value for --window is 10 and --depth is 50. Configuration diff --git a/git.html b/git.html index 1aeb04d66..e2d64cbe2 100644 --- a/git.html +++ b/git.html @@ -2333,7 +2333,7 @@ contributors on the git-list <git@vger.kernel.org>.

diff --git a/git.txt b/git.txt index f84728bc1..273ca173d 100644 --- a/git.txt +++ b/git.txt @@ -40,7 +40,11 @@ Documentation for older releases are available here: * link:RelNotes-1.5.1.txt[release notes for 1.5.1] -* link:v1.5.1.2/git.html[documentation for release 1.5.1.2] +* link:v1.5.1.4/git.html[documentation for release 1.5.1.4] + +* link:RelNotes-1.5.1.4.txt[release notes for 1.5.1.4] + +* link:RelNotes-1.5.1.3.txt[release notes for 1.5.1.3] * link:RelNotes-1.5.1.2.txt[release notes for 1.5.1.2] diff --git a/user-manual.html b/user-manual.html index 43fc75dce..7bcf89c60 100644 --- a/user-manual.html +++ b/user-manual.html @@ -706,9 +706,9 @@ your personal repo ------------------> your public repo | | | they push V their public repo <------------------- their repo

Now, assume your personal repository is in the directory ~/proj. We -first create a new clone of the repository:

$ git clone --bare proj.git

The resulting directory proj.git will contains a "bare" git -repository—it is just the contents of the ".git" directory, without -a checked-out copy of a working directory.

Next, copy proj.git to the server where you plan to host the +first create a new clone of the repository:

$ git clone --bare ~/proj proj.git

The resulting directory proj.git contains a "bare" git repository—it is +just the contents of the ".git" directory, without a checked-out copy of +a working directory.

Next, copy proj.git to the server where you plan to host the public repository. You can use scp, rsync, or whatever is most convenient.

If somebody else maintains the public server, they may already have set up a git service for you, and you may skip to the section @@ -882,9 +882,8 @@ branch.master.remote=origin
branch.master.merge=refs/heads/master

If there are other repositories that you also use frequently, you can create similar configuration options to save typing; for example, after

$ git config remote.example.url git://example.com/proj.git

then the following two commands will do the same thing:

$ git fetch git://example.com/proj.git master:refs/remotes/example/master
-$ git fetch example master:refs/remotes/example/master

Even better, if you add one more option:

$ git config remote.example.fetch master:refs/remotes/example/master

then the following commands will all do the same thing:

$ git fetch git://example.com/proj.git master:ref/remotes/example/master
-$ git fetch example master:ref/remotes/example/master
-$ git fetch example example/master
+$ git fetch example master:refs/remotes/example/master

Even better, if you add one more option:

$ git config remote.example.fetch master:refs/remotes/example/master

then the following commands will all do the same thing:

$ git fetch git://example.com/proj.git master:refs/remotes/example/master
+$ git fetch example master:refs/remotes/example/master
$ git fetch example

You can also add a "+" to force the update each time:

$ git config remote.example.fetch +master:ref/remotes/example/master

Don't do this unless you're sure you won't mind "git fetch" possibly throwing away commits on mybranch.

Also note that all of the above configuration can be performed by directly editing the file .git/config instead of using diff --git a/user-manual.txt b/user-manual.txt index 67f5b9b6a..13db9699c 100644 --- a/user-manual.txt +++ b/user-manual.txt @@ -1836,12 +1836,12 @@ Now, assume your personal repository is in the directory ~/proj. We first create a new clone of the repository: ------------------------------------------------- -$ git clone --bare proj.git +$ git clone --bare ~/proj proj.git ------------------------------------------------- -The resulting directory proj.git will contains a "bare" git -repository--it is just the contents of the ".git" directory, without -a checked-out copy of a working directory. +The resulting directory proj.git contains a "bare" git repository--it is +just the contents of the ".git" directory, without a checked-out copy of +a working directory. Next, copy proj.git to the server where you plan to host the public repository. You can use scp, rsync, or whatever is most @@ -2372,9 +2372,8 @@ $ git config remote.example.fetch master:refs/remotes/example/master then the following commands will all do the same thing: ------------------------------------------------- -$ git fetch git://example.com/proj.git master:ref/remotes/example/master -$ git fetch example master:ref/remotes/example/master -$ git fetch example example/master +$ git fetch git://example.com/proj.git master:refs/remotes/example/master +$ git fetch example master:refs/remotes/example/master $ git fetch example ------------------------------------------------- -- 2.26.2