Merge branch 'maint'

* maint:
archive: document limitation of tar.umask config setting
t3306,t5304: avoid clock skew issues
git.txt: fix list continuation

diff --combined Documentation/git-archive.txt
index f2b8684596576cd515e617ea68f06a479348b522,66943fdf83ff6dbbf6de4be98e90c764389565a9..9c750e24446b58efc2bd8d5e44566d060eaa353a
--- 1/Documentation/git-archive.txt
--- 2/Documentation/git-archive.txt
+++ b/Documentation/git-archive.txt
@@@ -98,7 -98,8 +98,8 @@@ tar.umask:
        tar archive entries.  The default is 0002, which turns off the
        world write bit.  The special value "user" indicates that the
        archiving user's umask will be used instead.  See umask(2) for
-       details.
+       details.  If `--remote` is used then only the configuration of
+       the remote repository takes effect.
  
  ATTRIBUTES
  ----------
@@@ -153,6 -154,14 +154,6 @@@ SEE ALS
  --------
  linkgit:gitattributes[5]
  
 -Author
 -------
 -Written by Franck Bui-Huu and Rene Scharfe.
 -
 -Documentation
 ---------------
 -Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
 -
  GIT
  ---
  Part of the linkgit:git[1] suite

diff --combined Documentation/git.txt
index 7df49ea0d288f65737568b2746c4e404e55cd06d,5a174bcfc5186c129cbbb182ff47c0599c10d395..b8fa77b7ac44a644cca837352df3e02fd97d636b
--- 1/Documentation/git.txt
--- 2/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -44,12 -44,9 +44,12 @@@ unreleased) version of git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
 -* link:v1.7.4.1/git.html[documentation for release 1.7.4.1]
 +* link:v1.7.4.4/git.html[documentation for release 1.7.4.4]
  
  * release notes for
 +  link:RelNotes/1.7.4.4.txt[1.7.4.4],
 +  link:RelNotes/1.7.4.3.txt[1.7.4.3],
 +  link:RelNotes/1.7.4.2.txt[1.7.4.2],
    link:RelNotes/1.7.4.1.txt[1.7.4.1],
    link:RelNotes/1.7.4.txt[1.7.4].
  
@@@ -622,7 -619,6 +622,6 @@@ where
                           contents of <old|new>,
        <old|new>-hex:: are the 40-hexdigit SHA1 hashes,
        <old|new>-mode:: are the octal representation of the file modes.
- 
  +
  The file parameters can point at the user's working file
  (e.g. `new-file` in "git-diff-files"), `/dev/null` (e.g. `old-file`
@@@ -748,12 -744,16 +747,12 @@@ unmerged version of a file when a merg
  
  Authors
  -------
 -* git's founding father is Linus Torvalds <torvalds@osdl.org>.
 -* The current git nurse is Junio C Hamano <gitster@pobox.com>.
 -* The git potty was written by Andreas Ericsson <ae@op5.se>.
 -* General upbringing is handled by the git-list <git@vger.kernel.org>.
 -
 -Documentation
 ---------------
 -The documentation for git suite was started by David Greaves
 -<david@dgreaves.com>, and later enhanced greatly by the
 -contributors on the git-list <git@vger.kernel.org>.
 +Git was started by Linus Torvalds, and is currently maintained by Junio
 +C Hamano. Numerous contributions have come from the git mailing list
 +<git@vger.kernel.org>. For a more complete list of contributors, see
 +http://git-scm.com/about. If you have a clone of git.git itself, the
 +output of linkgit:git-shortlog[1] and linkgit:git-blame[1] can show you
 +the authors for specific parts of the project.
  
  Reporting Bugs
  --------------