Merge branch 'master' into next

* master:
  Update draft release notes for 12th batch
  Start preparing for 1.7.10.3
  link to gitmodules page at the beginning of git-submodule documentation
  pack-protocol: fix first-want separator in the examples
  l10n: zh_CN.po: translate 1 new message
  l10n: de.po: translate one new message
  l10n: de.po: unify translation of "ahead" and "behind"
  l10n: de.po: collection of improvements
  l10n: de.po: translate "remote" as "extern"
  l10n: de.po: translate "track" as "beobachten"
  l10n: add new members to German translation team
  l10n: de.po: collection of suggestions
  l10n: de.po: translate "bad" as "ungültig" ("invalid")
  l10n: de.po: hopefully uncontroversial fixes
  l10n: de.po: translate "bare" as "bloß"
  l10n: Update git.pot (275 new, 15 removed messages)
  l10n: Update git.pot (1 new messages)

Documentation/RelNotes/1.7.10.3.txt

@@ -0,0 +1,26 @@
+Git v1.7.10.3 Release Notes
+===========================
+
+Fixes since v1.7.10.2
+---------------------
+
+ * Running "git checkout" on an unborn branch used to corrupt HEAD.
+
+ * When checking out another commit from an already detached state, we
+   used to report all commits that are not reachable from any of the
+   refs as lossage, but some of them might be reachable from the new
+   HEAD, and there is no need to warn about them.
+
+ * Some time ago, "git clone" lost the progress output for its
+   "checkout" phase; when run without any "--quiet" option, it should
+   give progress to the lengthy operation.
+
+ * "log -z --pretty=tformat:..." did not terminate each record with
+   NUL.  The fix is not entirely correct when the output also asks for
+   --patch and/or --stat, though.
+
+ * The DWIM behaviour for "log --pretty=format:%gd -g" was somewhat
+   broken and gave undue precedence to configured log.date, causing
+   "git stash list" to show "stash@{time stamp string}".
+
+Also contains minor fixes and documentation updates.

Documentation/RelNotes/1.7.11.txt

@@ -85,6 +85,10 @@ Performance and Internal Implementation (please report possible regressions)
  * "git archive" learned to produce its output without reading the
    blob object it writes out in memory in its entirety.
 
+ * "git index-pack" that runs when fetching or pushing objects to
+   complete the packfile on the receiving end learned to use multiple
+   threads to do its job when available.
+
  * The code to compute hash values for lines used by the internal diff
    engine was optimized on little-endian machines, using the same
    trick the kernel folks came up with.
@@ -116,25 +120,6 @@ Unless otherwise noted, all the fixes since v1.7.10 in the maintenance
 releases are contained in this release (see release notes to them for
 details).
 
- * The DWIM behaviour for "log --pretty=format:%gd -g" was somewhat
-   broken and gave undue precedence to configured log.date, causing
-   "git stash list" to show "stash@{time stamp string}".
-   (merge 55ccf85 jk/maint-reflog-walk-count-vs-time later to maint).
-
- * Running "git checkout" on an unborn branch used to corrupt HEAD.
-   (merge 8338f77 ef/checkout-empty later to maint).
-
- * When checking out another commit from an already detached state, we
-   used to report all commits that are not reachable from any of the
-   refs as lossage, but some of them might be reachable from the new
-   HEAD, and there is no need to warn about them.
-   (merge 5d88639 js/checkout-detach-count later to maint).
-
- * Some time ago, "git clone" lost the progress output for its
-   "checkout" phase; when run without any "--quiet" option, it should
-   give progress to the lengthy operation.
-   (merge 8f63da1 ef/maint-clone-progress-fix later to maint).
-
  * "git status --porcelain" ignored "--branch" option by mistake.  The
    output for "git status --branch -z" was also incorrect and did not
    terminate the record for the current branch name with NUL as asked.
@@ -143,8 +128,3 @@ details).
  * "git diff --stat" used to fully count a binary file with modified
    execution bits whose contents is unmodified, which was not quite
    right.
-
- * "log -z --pretty=tformat:..." did not terminate each record with
-   NUL.  The fix is not entirely correct when the output also asks for
-   --patch and/or --stat, though.
-   (merge fafd382 jk/maint-tformat-with-z later to maint).

Documentation/git-submodule.txt

@@ -43,9 +43,9 @@ if you choose to go that route.
 Submodules are composed from a so-called `gitlink` tree entry
 in the main repository that refers to a particular commit object
 within the inner repository that is completely separate.
-A record in the `.gitmodules` file at the root of the source
-tree assigns a logical name to the submodule and describes
-the default URL the submodule shall be cloned from.
+A record in the `.gitmodules` (see linkgit:gitmodules[5]) file at the
+root of the source tree assigns a logical name to the submodule and
+describes the default URL the submodule shall be cloned from.
 The logical name can be used for overriding this URL within your
 local repository configuration (see 'submodule init').
 

Documentation/technical/pack-protocol.txt

@@ -351,7 +351,7 @@ Then the server will start sending its packfile data.
 A simple clone may look like this (with no 'have' lines):
 
 ----
-   C: 0054want 74730d410fcb6603ace96f1dc55ea6196122532d\0multi_ack \
+   C: 0054want 74730d410fcb6603ace96f1dc55ea6196122532d multi_ack \
      side-band-64k ofs-delta\n
    C: 0032want 7d1665144a3a975c05f1f43902ddaf084e784dbe\n
    C: 0032want 5a3f6be755bbb7deae50065988cbfa1ffa9ab68a\n
@@ -367,7 +367,7 @@ A simple clone may look like this (with no 'have' lines):
 An incremental update (fetch) response might look like this:
 
 ----
-   C: 0054want 74730d410fcb6603ace96f1dc55ea6196122532d\0multi_ack \
+   C: 0054want 74730d410fcb6603ace96f1dc55ea6196122532d multi_ack \
      side-band-64k ofs-delta\n
    C: 0032want 7d1665144a3a975c05f1f43902ddaf084e784dbe\n
    C: 0032want 5a3f6be755bbb7deae50065988cbfa1ffa9ab68a\n

po/TEAMS

@@ -8,6 +8,9 @@ Leader:		Byrial Jensen <byrial@vip.cybercity.dk>
 Language:	de (German)
 Repository:	https://github.com/ralfth/git-po-de
 Leader:		Ralf Thielow <ralf.thielow@googlemail.com>
+Members:	Thomas Rast <trast@student.ethz.ch>
+		Jan Krüger <jk@jk.gs>
+		Christian Stimming <stimming@tuhh.de>
 
 Language:	is (Icelandic)
 Leader:		Ævar Arnfjörð Bjarmason <avarab@gmail.com>