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: (30 commits)
  Fix segfault in diff-delta.c when FLEX_ARRAY is 1
  rebase -p -i: handle "no changes" gracefully
  Document diff.external and mergetool.<tool>.path
  Support config variable diff.external
  Clean up documentation that references deprecated 'git peek-remote'.
  Clarify error response from 'git fetch' for bad responses
  the use of 'tr' in the test suite isn't really portable
  Plug a resource leak in threaded pack-objects code.
  git-send-email: avoid duplicate message-ids
  clone: correctly report http_fetch errors
  Documentation/git-submodule: refer to gitmodules(5)
  threaded pack-objects: Use condition variables for thread communication.
  builtin-commit: make summary output consistent with status
  builtin-commit: fix summary output.
  builtin-apply: stronger indent-with-on-tab fixing
  builtin-apply: minor cleanup of whitespace detection
  Re-re-re-fix common tail optimization
  whitespace: fix config.txt description of indent-with-non-tab
  whitespace: more accurate initial-indent highlighting
  whitespace: fix initial-indent checking
  ...