Merge branch 'maint'
authorJunio C Hamano <junkio@cox.net>
Tue, 7 Nov 2006 06:56:07 +0000 (22:56 -0800)
committerJunio C Hamano <junkio@cox.net>
Tue, 7 Nov 2006 06:56:07 +0000 (22:56 -0800)
commitbd45fec8397f1f0804db1d18af7193be323b0326
treed167c73fa8da80ad93840de8fdb6e13d6b39f371
parentd28f7cb93537554e069667602a7624952e06df50
parente52775f43857f377aa2aa69f82ac2d2f26dc6297
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
Documentation/git-rebase.txt
wt-status.c