I think I understand the desire for better, easier tools (git does make branching and merging super-easy), but could I sidetrack the git discussion for a bit and ask that people review the InterWiki Transclusion branch (http://hexm.de/0y)?
Roan has already reviewed a big part of the code, but his time is very limited right now. People have been asking for this for quite a while: the bug number is 9890 (https://bugzilla.wikimedia.org/9890). I'd like to get it reviewed before too much bit-rot sets in.
Mark.