Merge branch 'maint-1.6.2' into maint-1.6.3

* maint-1.6.2:
  Fix overridable written with an extra 'e'
  Documentation: git-archive: mark --format as optional in summary
  Round-down years in "years+months" relative date view

Conflicts:
	Documentation/git-archive.txt

diff --cc Documentation/git-archive.txt
index bc132c87e1a5b9f42ea1f2bbd4e3c46f67fc3852,105a31a088c7846c0844d8f844eaba46061a3172..92444ddf10081ee5faccd28491b47ef1cb45deee
--- 1/Documentation/git-archive.txt
--- 2/Documentation/git-archive.txt
+++ b/Documentation/git-archive.txt
@@@ -9,8 -9,7 +9,8 @@@ git-archive - Create an archive of file
  SYNOPSIS
  --------
  [verse]
- 'git archive' --format=<fmt> [--list] [--prefix=<prefix>/] [<extra>]
+ 'git archive' [--format=<fmt>] [--list] [--prefix=<prefix>/] [<extra>]
 +            [--output=<file>] [--worktree-attributes]
              [--remote=<repo> [--exec=<git-upload-archive>]] <tree-ish>
              [path...]
  

diff --cc gitweb/gitweb.perl
Simple merge