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)
commit4ed54610e5ca8fdc34dcf8729f6416599d1bc39e
tree3eca1184326848950e0a35938c7ca7032e45a6a1
parent55ac692661f7b850bb0160de18fa9868d24dbe17
parentc35ec8c901a2391c4652ab1acdff04c9d67b1543
Merge branch 'da/git-prefix-everywhere' into next

* da/git-prefix-everywhere:
  t/t7503-pre-commit-hook.sh: Add GIT_PREFIX tests
  git-mergetool--lib: Make vimdiff retain the current directory
  git: Remove handling for GIT_PREFIX
  setup: Provide GIT_PREFIX to built-ins
git-mergetool--lib.sh
git.c
setup.c
t/t1020-subdirectory.sh