Git 2.0-rc2

diff --git a/Documentation/RelNotes/2.0.0.txt b/Documentation/RelNotes/2.0.0.txt
index ffd4899dcddea473b30fd8757f4dbe5a45986d4d..e6911ac42fc8fd6e81821c1fc173b3a2e979ead7 100644 (file)
--- a/Documentation/RelNotes/2.0.0.txt
+++ b/Documentation/RelNotes/2.0.0.txt
@@ -179,7 +179,12 @@ 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
+ * The shell prompt script (in contrib/), when using the PROMPT_COMMAND
+   interface, used an unsafe construct when showing the branch name in
+   $PS1.
+   (merge 8976500 rh/prompt-pcmode-avoid-eval-on-refname later to maint).
+
+ * The remote-helper 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.

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 690cece24c0f5cb335c9152c0a0c885f35d3e08b..d356425e190f2ffa8401d09f7fe3eb28ff311457 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.0.0-rc1
+DEF_VER=v2.0.0-rc2
 
 LF='
 '