Merge git://github.com/git-l10n/git-po to update Swedish translation
* git://github.com/git-l10n/git-po:
l10n: Fixes to Swedish translation
diff --git a/Documentation/RelNotes/1.7.11.5.txt b/Documentation/RelNotes/1.7.11.5.txt
index 86df992..0a2ed85 100644
--- a/Documentation/RelNotes/1.7.11.5.txt
+++ b/Documentation/RelNotes/1.7.11.5.txt
@@ -7,6 +7,10 @@
* The Makefile rule to create assembly output (primarily for
debugging purposes) did not create it next to the source.
+ * 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.
+
* On some architectures, "block-sha1" did not compile correctly
when compilers inferred alignment guarantees from our source we
did not intend to make.
@@ -25,4 +29,8 @@
* "git mergetool" did not support --tool-help option to give the list
of supported backends, like "git difftool" does.
+ * "git grep" stopped spawning an external "grep" long time ago, but a
+ duplicated test to check internal and external "grep" was left
+ behind.
+
Also contains minor typofixes and documentation updates.
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 @@
* "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 @@
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/Documentation/git.txt b/Documentation/git.txt
index 7af8aaa..677eb95 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -44,9 +44,10 @@
branch of the `git.git` repository.
Documentation for older releases are available here:
-* link:v1.7.11.4/git.html[documentation for release 1.7.11.4]
+* link:v1.7.11.5/git.html[documentation for release 1.7.11.5]
* release notes for
+ link:RelNotes/1.7.11.5.txt[1.7.11.5],
link:RelNotes/1.7.11.4.txt[1.7.11.4],
link:RelNotes/1.7.11.3.txt[1.7.11.3],
link:RelNotes/1.7.11.2.txt[1.7.11.2],
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='
'
