From: Junio C Hamano Date: Fri, 14 Dec 2007 08:35:13 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.4-rc0-7-g913b4 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=878cc1ea41f4efa8e7304e7559ddf8300ceed8d0;p=git.git Autogenerated HTML docs for v1.5.4-rc0-7-g913b4 --- diff --git a/RelNotes-1.5.4.txt b/RelNotes-1.5.4.txt index 6645565c5..d6fd3ddd1 100644 --- a/RelNotes-1.5.4.txt +++ b/RelNotes-1.5.4.txt @@ -43,6 +43,17 @@ Deprecation notices * "git peek-remote" is deprecated, as "git ls-remote" was written in C and works for all transports, and will be removed in the future. + * From v1.5.5, the repack.usedeltabaseoffset config option will default + to true, which will give denser packfile (i.e. more efficient storage). + The downside is that git older than version 1.4.4 will not be able + to directly use a repository packed using this setting. + + * From v1.5.5, the pack.indexversion config option will default to 2, + which is slightly more efficient, and makes repacking more immune to + data corruptions. Git older than version 1.5.2 may revert to version 1 + of the pack index with a manual "git index-pack" to be able to directly + access corresponding pack files. + Updates since v1.5.3 -------------------- diff --git a/user-manual.html b/user-manual.html index ee9594bd1..a5f093282 100644 --- a/user-manual.html +++ b/user-manual.html @@ -777,7 +777,7 @@ use git rebase to rebase any already-published comm in the section called “Keeping a patch series up to date using git-rebase”).

You may force git-push to perform the update anyway by preceding the branch name with a plus sign:

$ git push ssh://yourserver.com/~you/proj.git +master

Normally whenever a branch head in a public repository is modified, it -is modified to point to a descendent of the commit that it pointed to +is modified to point to a descendant of the commit that it pointed to before. By forcing a push in this situation, you break that convention. (See the section called “Problems with rewriting history”.)

Nevertheless, this is a common practice for people that need a simple way to publish a work-in-progress patch series, and it is an acceptable @@ -1203,7 +1203,7 @@ a tree: The SHA1 name of a tree object (as defined below), representing the contents of a directory at a certain point in time.

  • parent(s): The SHA1 name of some number of commits which represent the - immediately prevoius step(s) in the history of the project. The + immediately previous step(s) in the history of the project. The example above has one parent; merge commits may have more than one. A commit with no parents is called a "root" commit, and represents the initial revision of a project. Each project must have @@ -1368,7 +1368,7 @@ git directory using clone, or just using cp, tar, or any other backup mechanism.

    As a last resort, you can search for the corrupted objects and attempt to replace them by hand. Back up your repository before attempting this in case you corrupt things even more in the process.

    We'll assume that the problem is a single missing or corrupted blob, -which is sometimes a solveable problem. (Recovering missing trees and +which is sometimes a solvable problem. (Recovering missing trees and especially commits is much harder).

    Before starting, verify that there is corruption, and figure out where it is with git-fsck(1); this may be time-consuming.

    Assume the output looks like this:

    $ git-fsck --full
    broken link from    tree 2d9263c6d23595e7cb2a21e5ebbb53655278dff8
    diff --git a/user-manual.txt b/user-manual.txt index 93a47b439..f2b42068f 100644 --- a/user-manual.txt +++ b/user-manual.txt @@ -1994,7 +1994,7 @@ $ git push ssh://yourserver.com/~you/proj.git +master ------------------------------------------------- Normally whenever a branch head in a public repository is modified, it -is modified to point to a descendent of the commit that it pointed to +is modified to point to a descendant of the commit that it pointed to before. By forcing a push in this situation, you break that convention. (See <>.) @@ -2921,7 +2921,7 @@ As you can see, a commit is defined by: - a tree: The SHA1 name of a tree object (as defined below), representing the contents of a directory at a certain point in time. - parent(s): The SHA1 name of some number of commits which represent the - immediately prevoius step(s) in the history of the project. The + immediately previous step(s) in the history of the project. The example above has one parent; merge commits may have more than one. A commit with no parents is called a "root" commit, and represents the initial revision of a project. Each project must have @@ -3242,7 +3242,7 @@ to replace them by hand. Back up your repository before attempting this in case you corrupt things even more in the process. We'll assume that the problem is a single missing or corrupted blob, -which is sometimes a solveable problem. (Recovering missing trees and +which is sometimes a solvable problem. (Recovering missing trees and especially commits is *much* harder). Before starting, verify that there is corruption, and figure out where