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: (43 commits)
  color unchanged lines as "plain" in "diff --color-words"
  autoconf: Add checking for unsetenv function
  core-tutorial typofix
  Officially deprecate repo-config.
  Fix random fast-import errors when compiled with NO_MMAP
  fast-import.c: don't try to commit marks file if write failed
  refs.c: rework ref_locks by abstracting from underlying struct lock_file
  Improve use of lockfile API
  close_lock_file(): new function in the lockfile API
  Document lockfile API
  Be more careful about updating refs
  Correct spelling in diff.c comment
  Documentation: fix and clarify grammar in git-merge docs.
  Make 'git fsck' complain about non-commit branches
  Make builtin-commit.c more careful about parenthood
  treat any file with NUL as binary
  git-commit: fix double close(2) that can close a wrong file descriptor
  hg-to-git: improve popen calls
  ls-remote: add -t and -h options.
  Squelch bogus progress output from git-rebase--interactive
  ...