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: (39 commits)
  doc/gitattributes: clarify location of config text
  hook/update: example of how to prevent branch creation
  Fix buffer overflow in config parser
  remote.c: use shorten_unambiguous_ref
  get_local_heads(): do not return random pointer if there is no head
  git-apply: fix option description
  Update git-add.txt according to the new possibilities of 'git add -p'.
  add-interactive: refactor mode hunk handling
  git add -p: new "quit" command at the prompt.
  builtin-apply: keep information about files to be deleted
  graph API: Added logic for colored edges
  tests: test applying criss-cross rename patch
  rev-parse: --abbrev-ref option to shorten ref name
  for-each-ref: utilize core.warnAmbiguousRefs for :short-format
  shorten_unambiguous_ref(): add strict mode
  docs/checkout: clarify what "non-branch" means
  doc/checkout: split checkout and branch creation in synopsis
  doc/checkout: refer to git-branch(1) as appropriate
  doc: refer to tracking configuration as "upstream"
  doc: clarify --no-track option
  ...