Merge branch 'master' into next

* master: Git 2.0-rc0
git · Apr 18, 2014 · 0bd75c5 · 0bd75c5
2 parents 2ace126 + cc29195
commit 0bd75c5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/Documentation/RelNotes/2.0.0.txt b/Documentation/RelNotes/2.0.0.txt
@@ -174,6 +174,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).
 
+ * zsh prompt (in contrib/) leaked unnecessary error messages.
+
+ * bash completion (in contrib/) did not complete the refs and remotes
+   correctly given "git pu<TAB>" when "pu" is aliased to "push".
+
  * Some more Unicode codepoints defined in Unicode 6.3 as having zero
    width have been taught to our display column counting logic.
    (merge d813ab9 tb/unicode-6.3-zero-width later to maint).

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.9.0.GIT
+DEF_VER=v2.0.0-rc0
 
 LF='
 '