From: Junio C Hamano Date: Wed, 2 Jul 2008 03:06:38 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.6.1-156-ge903b X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fce7c7e1549d1a2a2b0faf5952378236eed4d468;p=git.git Autogenerated HTML docs for v1.5.6.1-156-ge903b --- diff --git a/RelNotes-1.5.6.2.txt b/RelNotes-1.5.6.2.txt new file mode 100644 index 000000000..02d5910d5 --- /dev/null +++ b/RelNotes-1.5.6.2.txt @@ -0,0 +1,31 @@ +GIT v1.5.6.2 Release Notes +========================== + +Futureproof +----------- + + * "git-shell" accepts requests without a dash between "git" and + subcommand name (e.g. "git upload-pack") which the newer client will + start to make sometime in the future. + +Fixes since v1.5.6.1 +-------------------- + +* Optimization for a large import via "git-svn" introduced in v1.5.6 had a + serious memory and temporary file leak, which made it unusable for + moderately large import. + +* "git-svn" mangled remote nickname used in the configuration file + unnecessarily. + +* "git diff --check" did not report the result via its exit status + reliably. + +* "git show" segfaulted when an annotated tag that points at another + annotated tag was given to it. + +-- +exec >/var/tmp/1 +echo O=$(git describe maint) +O=v1.5.6.1-13-g4f3dcc2 +git shortlog --no-merges $O..maint diff --git a/RelNotes-1.6.0.txt b/RelNotes-1.6.0.txt index 03e3a59ff..e5c285f9c 100644 --- a/RelNotes-1.6.0.txt +++ b/RelNotes-1.6.0.txt @@ -4,9 +4,6 @@ GIT v1.6.0 Release Notes User visible changes -------------------- -[[Note that none of these are not merged to 'master' as of this writing -but they will be before 1.6.0 happens]] - With the default Makefile settings, most of the programs are now installed outside your $PATH, except for "git", "gitk", "git-gui" and some server side programs that need to be accessible for technical @@ -21,6 +18,11 @@ scripts to use "git xyzzy" form, as we will stop installing Source changes needed for porting to MinGW environment are now all in the main git.git codebase. +By default, packfiles created with this version uses delta-base-offset +encoding introduced in v1.4.4. Pack idx files are using version 2 that +allows larger packs and added robustness thanks to its CRC checking, +introduced in v1.5.2. + Updates since v1.5.6 -------------------- @@ -77,14 +79,33 @@ Updates since v1.5.6 (usability, bells and whistles) +* git-apply can handle a patch that touches the same path more than once + much better than before. + +* git-apply can be told not to trust the line counts recorded in the input + patch but recount, with the new --recount option. + * git-archive can be told to omit certain paths from its output using export-ignore attributes. +* git-clone can clone from a remote whose URL would be rewritten by + configuration stored in $HOME/.gitconfig now. + +* git-diff --check now checks leftover merge conflict markers. + +* When remote side used to have branch 'foo' and git-fetch finds that now + it has branch 'foo/bar', it refuses to lose the existing remote tracking + branch and its reflog. The error message has been improved to suggest + pruning the remote if the user wants to proceed and get the latest set + of branches from the remote, including such 'foo/bar'. + * fast-export learned to export and import marks file; this can be used to interface with fast-import incrementally. * Original SHA-1 value for "update-ref -d" is optional now. +* git-send-mail can talk not just over SSL but over TLS now. + * You can tell "git status -u" to even more aggressively omit checking untracked files with --untracked-files=no. @@ -108,6 +129,6 @@ this release, unless otherwise noted. --- exec >/var/tmp/1 -O=v1.5.6.1-104-ga08b868 +O=v1.5.6.1-155-gaa0c1f2 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 6966384ce..561ff645f 100644 --- a/config.txt +++ b/config.txt @@ -945,9 +945,17 @@ pack.indexVersion:: legacy pack index used by Git versions prior to 1.5.2, and 2 for the new pack index with capabilities for packs larger than 4 GB as well as proper protection against the repacking of corrupted - packs. Version 2 is selected and this config option ignored - whenever the corresponding pack is larger than 2 GB. Otherwise - the default is 1. + packs. Version 2 is the default. Note that version 2 is enforced + and this config option ignored whenever the corresponding pack is + larger than 2 GB. ++ +If you have an old git that does not understand the version 2 `{asterisk}.idx` file, +cloning or fetching over a non native protocol (e.g. "http" and "rsync") +that will copy both `{asterisk}.pack` file and corresponding `{asterisk}.idx` file from the +other side may give you a repository that cannot be accessed with your +older version of git. If the `{asterisk}.pack` file is smaller than 2 GB, however, +you can use linkgit:git-index-pack[1] on the *.pack file to regenerate +the `{asterisk}.idx` file. pack.packSizeLimit:: The default maximum size of a pack. This setting only affects @@ -1004,8 +1012,12 @@ remotes.:: ". See linkgit:git-remote[1]. repack.usedeltabaseoffset:: - Allow linkgit:git-repack[1] to create packs that uses - delta-base offset. Defaults to false. + By default, linkgit:git-repack[1] creates packs that use + delta-base offset. If you need to share your repository with + git older than version 1.4.4, either directly or via a dumb + protocol such as http, then you need to set this option to + "false" and repack. Access from old git versions over the + native protocol are unaffected by this option. showbranch.default:: The default set of branches for linkgit:git-show-branch[1]. diff --git a/diff-options.txt b/diff-options.txt index 572154834..cba90fd27 100644 --- a/diff-options.txt +++ b/diff-options.txt @@ -241,4 +241,4 @@ endif::git-format-patch[] Do not show any source or destination prefix. For more detailed explanation on these common options, see also -linkgit:gitdiffcore[7][diffcore documentation]. +linkgit:gitdiffcore[7]. diff --git a/everyday.html b/everyday.html index cb4b83de1..702b25de5 100644 --- a/everyday.html +++ b/everyday.html @@ -1050,7 +1050,7 @@ upload to public HTTP server hosted by your ISP. diff --git a/git-add.html b/git-add.html index 0e7b67808..7ce159e7c 100644 --- a/git-add.html +++ b/git-add.html @@ -273,7 +273,7 @@ git-add(1) Manual Page

SYNOPSIS

-
git-add [-n] [-v] [--force | -f] [--interactive | -i] [--patch | -p] +
git add [-n] [-v] [--force | -f] [--interactive | -i] [--patch | -p] [--update | -u] [--refresh] [--ignore-errors] [--] <filepattern>…
@@ -429,7 +429,7 @@ commit.

The optional configuration variable core.excludesfile indicates a path to a file containing patterns of file names to exclude from git-add, similar to $GIT_DIR/info/exclude. Patterns in the exclude file are used in addition to -those in info/exclude. See gitrepository-layout(5)[repository layout].

+those in info/exclude. See gitrepository-layout(5).

EXAMPLES

@@ -623,7 +623,7 @@ double-quote and control characters will still have problems.

diff --git a/git-add.txt b/git-add.txt index b8e3fa675..011a74365 100644 --- a/git-add.txt +++ b/git-add.txt @@ -8,7 +8,7 @@ git-add - Add file contents to the index SYNOPSIS -------- [verse] -'git-add' [-n] [-v] [--force | -f] [--interactive | -i] [--patch | -p] +'git add' [-n] [-v] [--force | -f] [--interactive | -i] [--patch | -p] [--update | -u] [--refresh] [--ignore-errors] [--] ... @@ -107,7 +107,7 @@ Configuration The optional configuration variable 'core.excludesfile' indicates a path to a file containing patterns of file names to exclude from git-add, similar to $GIT_DIR/info/exclude. Patterns in the exclude file are used in addition to -those in info/exclude. See linkgit:gitrepository-layout[5][repository layout]. +those in info/exclude. See linkgit:gitrepository-layout[5]. EXAMPLES diff --git a/git-am.html b/git-am.html index eb6c0c57d..830ba2789 100644 --- a/git-am.html +++ b/git-am.html @@ -273,11 +273,11 @@ git-am(1) Manual Page

SYNOPSIS

-
git-am [--signoff] [--keep] [--utf8 | --no-utf8] +
git am [--signoff] [--keep] [--utf8 | --no-utf8] [--3way] [--interactive] [--binary] [--whitespace=<option>] [-C<n>] [-p<n>] <mbox>|<Maildir>… -git-am [--skip | --resolved]
+git am [--skip | --resolved]

DESCRIPTION

@@ -524,7 +524,7 @@ names.

diff --git a/git-am.txt b/git-am.txt index 46544a076..1296b9117 100644 --- a/git-am.txt +++ b/git-am.txt @@ -9,11 +9,11 @@ git-am - Apply a series of patches from a mailbox SYNOPSIS -------- [verse] -'git-am' [--signoff] [--keep] [--utf8 | --no-utf8] +'git am' [--signoff] [--keep] [--utf8 | --no-utf8] [--3way] [--interactive] [--binary] [--whitespace=