Merge branch 'maint'

* maint:
  format-patch: add MIME-Version header when we add content-type.
  Fixed link in user-manual
  import-tars: Use the "Link indicator" to identify directories
  git name-rev writes beyond the end of malloc() with large generations
  Documentation/branch: fix small typo in -D example

diff --cc Documentation/user-manual.txt
Simple merge

diff --cc commit.c
Simple merge

diff --cc contrib/fast-import/import-tars.perl
Simple merge

diff --cc git-compat-util.h
index c08688c8f355ccf61a746bbe1ac9a6788bdea7e3,7ed8b88b1f3cef2562693bbf6d68e2e4cef9465b..6bd8987b2774774fbbd3747a2b571b66ad78727b
--- 1/git-compat-util.h
--- 2/git-compat-util.h
+++ b/git-compat-util.h
@@@ -13,14 -13,9 +13,17 @@@
  
  #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
  
 +#ifdef __GNUC__
 +#define TYPEOF(x) (__typeof__(x))
 +#else
 +#define TYPEOF(x)
 +#endif
 +
 +#define MSB(x, bits) ((x) & TYPEOF(x)(~0ULL << (sizeof(x) * 8 - (bits))))
 +
+ /* Approximation of the length of the decimal representation of this type. */
+ #define decimal_length(x)     ((int)(sizeof(x) * 2.56 + 0.5) + 1)
+ 
  #if !defined(__APPLE__) && !defined(__FreeBSD__)
  #define _XOPEN_SOURCE 600 /* glibc2 and AIX 5.3L need 500, OpenBSD needs 600 for S_ISLNK() */
  #define _XOPEN_SOURCE_EXTENDED 1 /* AIX 5.3L needs this */