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: (31 commits)
  Documentation: Transplanting branch with git-rebase --onto
  Document git-pack-refs and link it to git(7).
  merge-recursive implicitely depends on trust_executable_bit
  adjust_shared_perm: chmod() only when needed.
  Fix git-runstatus for repositories containing a file named HEAD
  Remove more sed invocations from within bash completion.
  Support bash completion on symmetric difference operator.
  Take --git-dir into consideration during bash completion.
  Bash completion support for remotes in .git/config.
  Only load .exe suffix'd completions on Cygwin.
  Added missing completions for show-branch and merge-base.
  cherry is built-in, do not ship git-cherry.sh
  Remove unsupported C99 style struct initializers in git-archive.
  Remove SIMPLE_PROGRAMS and make git-daemon a normal program.
  Use ULONG_MAX rather than implicit cast of -1.
  git-svn: don't die on rebuild when --upgrade is specified
  git-svn: avoid printing filenames of files we're not tracking
  Added bash completion support for git-reset.
  Added completion support for git-branch.exe.
  apply: handle "traditional" creation/deletion diff correctly.
  ...

Conflicts (resolved to 'master' version):

	Documentation/git-rebase.txt