From 3727619bbead20ee102505c799e1b0737f0c04f7 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 4 Sep 2008 00:24:07 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.6.0.1-216-g1b23a --- RelNotes-1.6.0.2.txt | 50 +++++++++++++++++++++++++++++++++++++ RelNotes-1.6.1.txt | 59 +++++++++++++++++++++++++++++++++++++++++++- git-commit-tree.html | 8 +++--- git-commit-tree.txt | 4 +-- git-commit.html | 4 +-- git-log.html | 4 +-- git-show.html | 4 +-- git-var.html | 8 +++--- git-var.txt | 6 ++--- i18n.txt | 2 +- 10 files changed, 128 insertions(+), 21 deletions(-) create mode 100644 RelNotes-1.6.0.2.txt diff --git a/RelNotes-1.6.0.2.txt b/RelNotes-1.6.0.2.txt new file mode 100644 index 000000000..686e60713 --- /dev/null +++ b/RelNotes-1.6.0.2.txt @@ -0,0 +1,50 @@ +GIT v1.6.0.2 Release Notes +========================== + +Fixes since v1.6.0.1 +-------------------- + +* Installation on platforms that needs .exe suffix to git-* programs were + broken in 1.6.0.1. + +* Installation on filesystems without symbolic links support did nto + work well. + +* In-tree documentations and test scripts now use "git foo" form to set a + better example, instead of the "git-foo" form (which is an acceptable + form if you have "PATH=$(git --exec-path):$PATH" in your script) + +* Many commands did not use the correct working tree location when used + with GIT_WORK_TREE environment settings. + + + +* "git apply --unidiff-zero" incorrectly applied a -U0 patch that inserts + a new line before the second line. + +* "git clone $there $here/" with extra trailing slashes after explicit + local directory name $here did not work as expected. + +* "git diff --dirstat -M" did not add changes in subdirectories up + correctly for renamed paths. + +* "git for-each-ref refs/heads/" did not work as expected. + +* "git log --grep=pattern -i" did not ignore case. + +* "git log --pretty="%ad" --date=short" did not use short format when + showing the timestamp. + +* Build procedure for "git shell" that used stub versions of some + functions and globals was not understood by linkers on some platforms. + +* "git verify-pack -v" did not work correctly when given more than one + packfile. + +Also contains many documentation updates. + +-- +exec >/var/tmp/1 +O=v1.6.0.1-49-g6a42cfe +echo O=$(git describe maint) +git shortlog --no-merges $O..maint diff --git a/RelNotes-1.6.1.txt b/RelNotes-1.6.1.txt index d37da039f..7f41e30e2 100644 --- a/RelNotes-1.6.1.txt +++ b/RelNotes-1.6.1.txt @@ -28,17 +28,60 @@ on. * The underlying diff machinery to produce textual output has been optimized, which would result in faster "git blame" processing. +* Most of the test scripts (but not the ones that try to run servers) + can be run in parallel. + (usability, bells and whistles) * "git checkout --track origin/hack" used to be a syntax error. It now DWIMs to create a corresponding local branch "hack", i.e. acts as if you said "git checkout --track -b hack origin/hack". +* "git cherry-pick" can also utilize rerere for conflict resolution. + +* "git commit --author=$name" can look up author name from existing + commits. + +* "git count-objects" reports the on-disk footprint for packfiles and + their corresponding idx files. + +* "git daemon" learned --max-connections= option. + * "git diff" learned to mimick --suppress-blank-empty from GNU diff via a configuration option. +* "git diff" learned to put more sensible hunk headers for Python and + HTML contents. + +* "git help" learned to use GIT_MAN_VIEWER environment variable before + using "man" program. + * "git imap-send" can optionally talk SSL. +* "git index-pack" is more careful against disk corruption while + completing a thin pack. + +* "git log --check" and "git log --exit-code" passes their underlying diff + status with their exit status code. + +* "git log" learned --simplify-merges, a milder variant of --full-history; + "gitk --simplify-merges" is easier to view than with --full-history. + +* "git merge --squash" and "git merge --no-ff" into an unborn branch are + noticed as user errors. + +* "git merge -s $strategy" can use a custom built strategy if you have a + command "git-merge-$strategy" on your $PATH. + +* "git reflog expire branch" can be used in place of "git reflog expire + refs/heads/branch". + +* "git submodule foreach" subcommand allows you to iterate over checked + out submodules. + +* "git submodule sync" subcommands allows you to update the origin URL + recorded in submodule directories from the toplevel .gitmodules file. + (internal) * "git hash-object" learned to lie about the path being hashed, so that @@ -51,8 +94,22 @@ Fixes since v1.6.0 All of the fixes in v1.6.0.X maintenance series are included in this release, unless otherwise noted. +* "git add" and "git update-index" incorrectly allowed adding S/F when S + is a tracked symlink that points at a directory D that has a path F in + it (we still need to fix a similar nonsense when S is a submodule and F + is a path in it). + +* "git diff --stdin" used to take two trees on a line and compared them, + but we droppped support for such a use case long time ago. This has + been resurrected. + +* "git filter-branch" failed to rewrite a tag name with slashes in it. + +* "git push --tags --all $there" failed with generic usage message without + telling saying these two options are incompatible. + -- exec >/var/tmp/1 -O=v1.6.0-48-ge28a867 +O=v1.6.0.1-215-g9b8ae93 echo O=$(git describe master) git shortlog --no-merges $O..master ^maint diff --git a/git-commit-tree.html b/git-commit-tree.html index da3e1fd5d..bac8dd355 100644 --- a/git-commit-tree.html +++ b/git-commit-tree.html @@ -419,7 +419,7 @@ Your parents must have hated you!

- The password(5) gecos field is longer than a giant static buffer. + The passwd(5) gecos field is longer than a giant static buffer.

@@ -427,7 +427,7 @@ Your sysadmin must hate you!

- The password(5) name field is longer than a giant static buffer. + The passwd(5) name field is longer than a giant static buffer.

@@ -469,7 +469,7 @@ mind.

  1. -git-commit-tree (hence, git-commit which uses it) issues +git-commit and git-commit-tree issues a warning if the commit log message given to it does not look like a valid UTF-8 string, unless you explicitly say your project uses a legacy encoding. The way to say this is to @@ -525,7 +525,7 @@ reversible operation.

diff --git a/git-commit-tree.txt b/git-commit-tree.txt index 92ab3ab4a..b8834bace 100644 --- a/git-commit-tree.txt +++ b/git-commit-tree.txt @@ -79,9 +79,9 @@ Diagnostics You don't exist. Go away!:: The passwd(5) gecos field couldn't be read Your parents must have hated you!:: - The password(5) gecos field is longer than a giant static buffer. + The passwd(5) gecos field is longer than a giant static buffer. Your sysadmin must hate you!:: - The password(5) name field is longer than a giant static buffer. + The passwd(5) name field is longer than a giant static buffer. Discussion ---------- diff --git a/git-commit.html b/git-commit.html index 581c5235f..3b82a4fba 100644 --- a/git-commit.html +++ b/git-commit.html @@ -793,7 +793,7 @@ mind.

  1. -git-commit-tree (hence, git-commit which uses it) issues +git-commit and git-commit-tree issues a warning if the commit log message given to it does not look like a valid UTF-8 string, unless you explicitly say your project uses a legacy encoding. The way to say this is to @@ -863,7 +863,7 @@ Junio C Hamano <gitster@pobox.com>

diff --git a/git-log.html b/git-log.html index 4987f2120..516a927e9 100644 --- a/git-log.html +++ b/git-log.html @@ -2173,7 +2173,7 @@ mind.

  1. -git-commit-tree (hence, git-commit which uses it) issues +git-commit and git-commit-tree issues a warning if the commit log message given to it does not look like a valid UTF-8 string, unless you explicitly say your project uses a legacy encoding. The way to say this is to @@ -2225,7 +2225,7 @@ reversible operation.

diff --git a/git-show.html b/git-show.html index 9ffdb1100..df3f16d60 100644 --- a/git-show.html +++ b/git-show.html @@ -796,7 +796,7 @@ mind.

  1. -git-commit-tree (hence, git-commit which uses it) issues +git-commit and git-commit-tree issues a warning if the commit log message given to it does not look like a valid UTF-8 string, unless you explicitly say your project uses a legacy encoding. The way to say this is to @@ -850,7 +850,7 @@ Johannes Schindelin <Johannes.Schindelin@gmx.de>.

diff --git a/git-var.html b/git-var.html index c563a9dd0..b6a091d4f 100644 --- a/git-var.html +++ b/git-var.html @@ -337,7 +337,7 @@ git-var(1) Manual Page Cause the logical variables to be listed. In addition, all the variables of the git configuration file .git/config are listed as well. (However, the configuration variables listing functionality - is deprecated in favor of git-config -l.) + is deprecated in favor of git config -l.)

@@ -387,7 +387,7 @@ Your parents must have hated you!

- The password(5) gecos field is longer than a giant static buffer. + The passwd(5) gecos field is longer than a giant static buffer.

@@ -395,7 +395,7 @@ Your sysadmin must hate you!

- The password(5) name field is longer than a giant static buffer. + The passwd(5) name field is longer than a giant static buffer.

@@ -420,7 +420,7 @@ Your sysadmin must hate you! diff --git a/git-var.txt b/git-var.txt index 3647dd6c8..e2f4c0901 100644 --- a/git-var.txt +++ b/git-var.txt @@ -20,7 +20,7 @@ OPTIONS Cause the logical variables to be listed. In addition, all the variables of the git configuration file .git/config are listed as well. (However, the configuration variables listing functionality - is deprecated in favor of 'git-config -l'.) + is deprecated in favor of 'git config -l'.) EXAMPLE -------- @@ -41,9 +41,9 @@ Diagnostics You don't exist. Go away!:: The passwd(5) gecos field couldn't be read Your parents must have hated you!:: - The password(5) gecos field is longer than a giant static buffer. + The passwd(5) gecos field is longer than a giant static buffer. Your sysadmin must hate you!:: - The password(5) name field is longer than a giant static buffer. + The passwd(5) name field is longer than a giant static buffer. SEE ALSO -------- diff --git a/i18n.txt b/i18n.txt index fb0d7da56..d2970f835 100644 --- a/i18n.txt +++ b/i18n.txt @@ -21,7 +21,7 @@ project find it more convenient to use legacy encodings, git does not forbid it. However, there are a few things to keep in mind. -. 'git-commit-tree' (hence, 'git-commit' which uses it) issues +. 'git-commit' and 'git-commit-tree' issues a warning if the commit log message given to it does not look like a valid UTF-8 string, unless you explicitly say your project uses a legacy encoding. The way to say this is to -- 2.26.2