From: Junio C Hamano <junkio@cox.net>
Date: Tue, 7 Nov 2006 06:56:07 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.4.4-rc1~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/bd45fec8397f1f0804db1d18af7193be323b0326?ds=inline;hp=--cc

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
---

bd45fec8397f1f0804db1d18af7193be323b0326