Rebasing merge to junio/next (3f2cdae)
commit1c634d9e83abdd148f0ed6e55209a1a8c99ddb6d
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Tue, 14 Feb 2012 20:05:25 +0000 (14 14:05 -0600)
committerJohannes Schindelin <johannes.schindelin@gmx.de>
Tue, 14 Feb 2012 20:05:25 +0000 (14 14:05 -0600)
tree166f9f76c095194263eba6de0cee6e304d0c4fd6
parent1ec4c0695f56574abaa0305bdaddb50e149fec72
parente92cda2234d42e19970eb03f97064d8c1a7f0070
Rebasing merge to junio/next (3f2cdae)

Previous rebasing merge: ca999e8912d522b311053f4e247341751a2abccd

This rebasing merge skipped the following commits which have been reverted:

MinGW: Add missing file mode bit defines
Disable test on MinGW that challenges its bash quoting

and it skips the commit which has been applied upstream (after a hostile
welcome):

add -e: ignore dirty submodules

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>