summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-04-25 17:03:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-04-25 17:03:41 (GMT)
commit35936f8fc38a214cc7d2595070641d39a541dfb1 (patch)
tree79fcd5eb739ab712308858dca52fa556b066fda1
parent1697bf30df3ec6c28b180bc290d7d11d2fe97562 (diff)
downloadgit-35936f8fc38a214cc7d2595070641d39a541dfb1.zip
git-35936f8fc38a214cc7d2595070641d39a541dfb1.tar.gz
git-35936f8fc38a214cc7d2595070641d39a541dfb1.tar.bz2
Git 2.0-rc1v2.0.0-rc1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/2.0.0.txt5
-rwxr-xr-xGIT-VERSION-GEN2
2 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/RelNotes/2.0.0.txt b/Documentation/RelNotes/2.0.0.txt
index 3bd2b65..ffd4899 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 5b367ab..690cece 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='
'