Merge branch 'master' of git://git.kernel.org/pub/scm/git/git

Merge branch 'master' of git://git./git/git

* 'master' of git://git.kernel.org/pub/scm/git/git: (76 commits)
  git-rebase: suggest to use git-add instead of git-update-index
  Use =20 when rfc2047 encoding spaces.
  Create a new manpage for the gitignore format, and reference it elsewhere
  Documentation: robustify asciidoc GIT_VERSION replacement
  Fix git-am(1) synopsis formatting
  Fix minor grammatical typos in the git-gc man page
  diff-delta: use realloc instead of xrealloc
  git-config: Improve documentation of git-config file handling
  git-config: Various small fixes to asciidoc documentation
  always start looking up objects in the last used pack first
  fix repack with --max-pack-size
  Makefile: Use generic rule to build test programs
  decode_85(): fix missing return.
  fix signed range problems with hex conversions
  Add DLH to .mailmap
  Style nit - don't put space after function names
  Ensure the pack index is opened before access
  Simplify index access condition in count-objects, pack-redundant
  Test for recent rev-parse $abbrev_sha1 regression
  rev-parse: Identify short sha1 sums correctly.
  ...