Merge branch 'maint'

* maint:
Documentation: Transplanting branch with git-rebase --onto
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

diff --cc Documentation/git-rebase.txt
Simple merge

diff --cc wt-status.c
Simple merge