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 86df992c6bd57254e1cd946033e611370537b7d5..0a2ed855c5953bacb94eca4e1646e9ed8d2749ae 100644 (file)
--- a/Documentation/RelNotes/1.7.11.5.txt
+++ b/Documentation/RelNotes/1.7.11.5.txt
@@ -7,6 +7,10 @@ Fixes since v1.7.11.4
  * 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 @@ Fixes since v1.7.11.4
  * "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 fb7f761a38fbe55422084ee41362d0830f1f3a6b..010d8c7de471a373cf6f1d26422c4ed84ce23ced 100644 (file)
--- 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/Documentation/git.txt b/Documentation/git.txt
index 7af8aaa0478239ec14446854bcb52adbd73fc2cf..677eb959959c7f2bb728cabd19505776c069054d 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -44,9 +44,10 @@ unreleased) version of git, that is available from 'master'
 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 54c1fc86e008ba347489f24a7d091c12be05a4e1..d7ad6444db50f1de04f13ed7dd9befc09533eb2e 100755 (executable)
--- 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='
 '