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: (70 commits)
  Clean up and simplify rev_compare_tree()
  blame: correctly handle a path that used to be a directory
  add -i: do not dump patch during application
  Update draft release notes for 1.6.3.2
  test-lib: fix http exit codes
  test-lib: allow exit trap to be used for cleanup by tests
  test-lib: fail if invalid options are passed
  grep: fix colouring of matches with zero length
  git-show-branch.txt: document --date-order option
  diff: generate pretty filenames in prep_temp_blob()
  compat: add a basename() compatibility function
  compat: add a mkstemps() compatibility function
  git-add: no need for -f when resolving a conflict in already tracked path
  config.txt: document add.ignore-errors
  bash: remove always true if statement from __git_ps1()
  git-apply(1): Clarify that one can select where to apply the patch
  http-push: reuse existing is_null_ref
  Documentation: teach stash/pop workflow instead of stash/apply
  t9120: don't expect failure with SVN_HTTPD_PORT unset
  Documentation: teach stash/pop workflow instead of stash/apply
  ...