summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-08-26 04:00:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-08-26 04:00:46 (GMT)
commita452d148d10a89ae502bc4755c191ab323227ce5 (patch)
tree952ea0032389212351d0b22fd3e797e50b3559a6
parent284daf29026c519729747bd2051829f0f958473c (diff)
downloadgit-1.7.7-rc0.zip
git-1.7.7-rc0.tar.gz
git-1.7.7-rc0.tar.bz2
Git 1.7.7-rc0v1.7.7-rc0
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/1.7.7.txt11
-rwxr-xr-xGIT-VERSION-GEN2
2 files changed, 10 insertions, 3 deletions
diff --git a/Documentation/RelNotes/1.7.7.txt b/Documentation/RelNotes/1.7.7.txt
index dcbda84..a717cd6 100644
--- a/Documentation/RelNotes/1.7.7.txt
+++ b/Documentation/RelNotes/1.7.7.txt
@@ -103,14 +103,21 @@ Fixes since v1.7.6
Unless otherwise noted, all the fixes in 1.7.6.X maintenance track are
included in this release.
- * "ls-files ../$path" that is run from a subdirectory reported errors
+ * "git branch --set-upstream @{-1} foo" did not expand @{-1} correctly.
+ (merge e9d4f74 mg/branch-set-upstream-previous later to 'maint').
+
+ * "git describe --dirty" did not refresh the index before checking the
+ state of the working tree files.
+ (cherry-pick bb57148 ac/describe-dirty-refresh later to 'maint').
+
+ * "git ls-files ../$path" that is run from a subdirectory reported errors
incorrectly when there is no such path that matches the given pathspec.
(merge 0f64bfa cb/maint-ls-files-error-report later to 'maint').
--
exec >/var/tmp/1
echo O=$(git describe master)
-O=v1.7.6-576-g6fcb384
+O=v1.7.6.1-415-g284daf2
git log --first-parent --oneline $O..master
echo
git shortlog --no-merges ^maint ^$O master
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 8270abb..fea63c1 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v1.7.6.GIT
+DEF_VER=v1.7.7-rc0
LF='
'