From 35936f8fc38a214cc7d2595070641d39a541dfb1 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 25 Apr 2014 10:03:41 -0700 Subject: [PATCH] Git 2.0-rc1 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.0.0.txt | 5 +++++ GIT-VERSION-GEN | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Documentation/RelNotes/2.0.0.txt b/Documentation/RelNotes/2.0.0.txt index 3bd2b65964..ffd4899dcd 100644 --- a/Documentation/RelNotes/2.0.0.txt +++ b/Documentation/RelNotes/2.0.0.txt @@ -179,6 +179,11 @@ Unless otherwise noted, all the fixes since v1.9 in the maintenance track are contained in this release (see the maintenance releases' notes for details). + * The remote-helepr interface to fast-import/fast-export via the + transport-helper has been tightened to avoid leaving the import + marks file from a failed/crashed run, as such a file that is out of + sync with the reality confuses a later invocation of itself. + * "git rebase" used a POSIX shell construct FreeBSD /bin/sh does not work well with. (merge 8cd6596 km/avoid-non-function-return-in-rebase later to maint). diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 5b367ab7fe..690cece24c 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v2.0.0-rc0 +DEF_VER=v2.0.0-rc1 LF=' ' -- 2.11.4.GIT