GIT 1.5.5-rc1

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/RelNotes-1.5.5.txt b/Documentation/RelNotes-1.5.5.txt
index e31ae6a2938d3aa3d3668584ed29175bb7b61952..14beed49ba0c773551602af60d7820c74059316d 100644 (file)
--- a/Documentation/RelNotes-1.5.5.txt
+++ b/Documentation/RelNotes-1.5.5.txt
@@ -124,6 +124,9 @@ Updates since v1.5.4
  * "git gc" now automatically prunes unreachable objects that are two
    weeks old or older.
 
  * "git gc" now automatically prunes unreachable objects that are two
    weeks old or older.
 

+ * "git gc --auto" can be disabled more easily by just setting gc.auto
+   to zero.  It also tolerates more packfiles by default.
+

  * "git grep" now knows "--name-only" is a synonym for the "-l" option.
 
  * "git help <alias>" now reports "'git <alias>' is alias to <what>",
  * "git grep" now knows "--name-only" is a synonym for the "-l" option.
 
  * "git help <alias>" now reports "'git <alias>' is alias to <what>",


@@ -201,6 +204,6 @@ this release, unless otherwise noted.
 
 ---
 exec >/var/tmp/1
 
 ---
 exec >/var/tmp/1

-O=v1.5.4.4-620-gc817faa
+O=v1.5.5-rc1

 echo O=`git describe refs/heads/master`
 git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint
 echo O=`git describe refs/heads/master`
 git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 6ddf04d2161e5fd959c2fd69a7331520e8075d98..d0b60f40d80017b4638a403ff4b0ec05550014b2 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE

-DEF_VER=v1.5.4.GIT
+DEF_VER=v1.5.5-rc1.GIT

 
 LF='
 '
 
 LF='
 '