summary refs log tree commit
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-12-28 14:00:52 -0800
committerJunio C Hamano <gitster@pobox.com>2015-12-28 14:00:52 -0800
commit28274d02c489f4c7e68153056e9061a46f62d7a0 (patch)
treef6e01a2477451c57fc01ae51404fc6100edd5b58
parentaecb9979df1403923d66e7fc70b0374f1765b679 (diff)
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/2.7.0.txt11
-rwxr-xr-xGIT-VERSION-GEN2
2 files changed, 12 insertions, 1 deletions
diff --git a/Documentation/RelNotes/2.7.0.txt b/Documentation/RelNotes/2.7.0.txt
index dbc3fea7fa..563dadc57e 100644
--- a/Documentation/RelNotes/2.7.0.txt
+++ b/Documentation/RelNotes/2.7.0.txt
@@ -400,4 +400,15 @@ notes for details).
    in non-strict mode.
    (merge 92bcbb9 jk/ident-loosen-getpwuid later to maint).
 
+ * "git symbolic-ref" forgot to report a failure with its exit status.
+   (merge f91b273 jk/symbolic-ref-maint later to maint).
+
+ * History traversal with "git log --source" that starts with an
+   annotated tag failed to report the tag as "source", due to an
+   old regression in the command line parser back in v2.2 days.
+   (merge 728350b jk/pending-keep-tag-name later to maint).
+
+ * "git p4" when interacting with multiple depots at the same time
+   used to incorrectly drop changes.
+
  * Code clean-up, minor fixes etc.
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 904265b2c1..5abd186bd9 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.7.0-rc2
+DEF_VER=v2.7.0-rc3
 
 LF='
 '