Merge branch 'da/git-prefix-everywhere' into next
authorJunio C Hamano <gitster@pobox.com>
Thu, 30 Jun 2011 00:09:27 +0000 (17:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Jun 2011 00:09:27 +0000 (17:09 -0700)
commit4ed5461...e5ca8fdc34dcf8729f6416599d1bc39e
tree3eca118...326848950e0a35938c7ca7032e45a6a1copy hash to clipboard (tree)
parent55ac692...61f7b850bb0160de18fa9868d24dbe17copy hash to clipboard (diff)
parentc35ec8c...01a2391c4652ab1acdff04c9d67b1543copy hash to clipboard (diff)
git-mergetool--lib.sh
git.c
setup.c
t/t1020-subdirectory.sh