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: (56 commits)
  Git 1.7.5.4
  diffcore-rename.c: avoid set-but-not-used warning
  Update draft release notes to 1.7.6
  Start 1.7.5.4 draft release notes
  config.c: Remove unused git_config_global() function
  Documentation: do not misinterpret refspecs as bold text
  format-patch: make zero-length subject prefixes prettier
  git-sh-i18n--envsubst: add SYNOPSIS section to the documentation
  git-grep: Fix problems with recently added tests
  log: --quiet should serve as synonym to -s
  rebase: write a reflog entry when finishing
  rebase: create HEAD reflog entry when aborting
  config.mak.in: allow "configure --sysconfdir=/else/where"
  docs: fix some antique example output
  docs: make sure literal "->" isn't converted to arrow
  docs: update status --porcelain format
  docs: minor grammar fixes to git-status
  format-patch: preserve subject newlines with -k
  clean up calling conventions for pretty.c functions
  pretty: add pp_commit_easy function for simple callers
  ...