From cf5c51efc9fe3b0ef93c7b78005c57b71acaf959 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 17 Feb 2008 01:18:54 -0800 Subject: [PATCH] Sync with 1.5.4.2 and start 1.5.5 Release Notes Signed-off-by: Junio C Hamano --- .mailmap | 1 + Documentation/RelNotes-1.5.5.txt | 78 ++++++++++++++++++++++++++++++++ Documentation/git.txt | 3 +- GIT-VERSION-GEN | 2 +- RelNotes | 2 +- 5 files changed, 83 insertions(+), 3 deletions(-) create mode 100644 Documentation/RelNotes-1.5.5.txt diff --git a/.mailmap b/.mailmap index a32d9e2a3f..f88ae77a1f 100644 --- a/.mailmap +++ b/.mailmap @@ -17,6 +17,7 @@ H. Peter Anvin H. Peter Anvin H. Peter Anvin Horst H. von Brand +Jay Soffian Joachim Berdal Haga Jon Loeliger Jon Seymour diff --git a/Documentation/RelNotes-1.5.5.txt b/Documentation/RelNotes-1.5.5.txt new file mode 100644 index 0000000000..c8b4f72c23 --- /dev/null +++ b/Documentation/RelNotes-1.5.5.txt @@ -0,0 +1,78 @@ +GIT v1.5.5 Release Notes +======================== + +Updates since v1.5.4 +-------------------- + +(performance) + + * On platforms with suboptimal qsort(3) implementation, there + is an option to use more reasonable substitute we ship with + our software. + + * New configuration variable "pack.packsizelimit" can be used + in place of command line option --max-pack-size. + + * "git fetch" over the native git protocol used to make a + connection to find out the set of current remote refs and + another to actually download the pack data. We now use only + one connection for these tasks. + + * "git commit" does not run lstat(2) more than necessary + anymore. + +(usability, bells and whistles) + + * You can be warned when core.autocrlf conversion is applied in + such a way that results in an irreversible conversion. + + * A pattern "foo/" in .gitignore file now matches a directory + "foo". Pattern "foo" also matches as before. + + * "git describe" learned to limit the tags to be used for + naming with --match option. + + * "git describe --contains" now barfs when the named commit + cannot be described. + + * bash completion's prompt helper function can talk about + operation in-progress (e.g. merge, rebase, etc.). + + * "git commit" learned a new hook "prepare-commit-msg" that can + inspect what is going to be committed and prepare the commit + log message template to be edited. + + * "git gui" learned an auto-spell checking. + + * "git send-email" learned to prompt for passwords + interactively. + + * "git send-email" learned an easier way to suppress CC + recipients. + + * Various "git cvsimport", "git cvsexportcommit", "git svn" and + "git p4" improvements. + +(internal) + + * Duplicated code between git-help and git-instaweb that + launches user's preferred browser has been refactored. + + * It is now easier to write test scripts that records known + breakages. + + +Fixes since v1.5.4 +------------------ + +All of the fixes in v1.5.4 maintenance series are included in +this release, unless otherwise noted. + + +--- +exec >/var/tmp/1 +O=v1.5.4 +O=v1.5.4.2-122-g7cb97da +echo O=`git describe refs/heads/master` +git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint + diff --git a/Documentation/git.txt b/Documentation/git.txt index e22c4c4ae9..d57bed618f 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -43,9 +43,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.4.1/git.html[documentation for release 1.5.4.1] +* link:v1.5.4.2/git.html[documentation for release 1.5.4.2] * release notes for + link:RelNotes-1.5.4.2.txt[1.5.4.2], link:RelNotes-1.5.4.1.txt[1.5.4.1], link:RelNotes-1.5.4.txt[1.5.4]. diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 03fb9d76ae..1ad324e236 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.5.4.2.GIT +DEF_VER=v1.5.4.GIT LF=' ' diff --git a/RelNotes b/RelNotes index 7ab3485455..3e77358f70 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes-1.5.4.2.txt \ No newline at end of file +Documentation/RelNotes-1.5.5.txt \ No newline at end of file