summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-08-15 20:46:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-08-15 20:46:16 (GMT)
commit2a9a19e1b160c8c63c470d4c236d65709214a66f (patch)
tree816ad528b1a2023ffc157b9993411e95e22f9e78
parent47e32d071ea7623be4e2b53ce412612139e4127f (diff)
downloadgit-2a9a19e1b160c8c63c470d4c236d65709214a66f.zip
git-2a9a19e1b160c8c63c470d4c236d65709214a66f.tar.gz
git-2a9a19e1b160c8c63c470d4c236d65709214a66f.tar.bz2
Git 1.7.12-rc3v1.7.12-rc3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/1.7.12.txt11
-rwxr-xr-xGIT-VERSION-GEN2
2 files changed, 2 insertions, 11 deletions
diff --git a/Documentation/RelNotes/1.7.12.txt b/Documentation/RelNotes/1.7.12.txt
index fb7f761..010d8c7 100644
--- a/Documentation/RelNotes/1.7.12.txt
+++ b/Documentation/RelNotes/1.7.12.txt
@@ -116,6 +116,7 @@ Performance, Internal Implementation, etc. (please report possible regressions)
* "git svn" got a large-looking code reorganization at the last
minute before the code freeze.
+
Also contains minor documentation updates and code clean-ups.
@@ -126,16 +127,6 @@ Unless otherwise noted, all the fixes since v1.7.11 in the maintenance
releases are contained in this release (see release notes to them for
details).
- * "git grep" stopped spawning an external "grep" long time ago, but a
- duplicated test to check internal and external "grep" was left
- behind.
- (merge 4ca9453 rj/maint-grep-remove-redundant-test later to maint).
-
- * The code to avoid mistaken attempt to add the object directory
- itself as its own alternate could read beyond end of a string while
- comparison.
- (merge cb2912c hv/link-alt-odb-entry later to maint).
-
* "git submodule add" was confused when the superproject did not have
its repository in its usual place in the working tree and GIT_DIR
and GIT_WORK_TREE was used to access it.
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 54c1fc8..d7ad644 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v1.7.12-rc2
+DEF_VER=v1.7.12-rc3
LF='
'