Merge branch 'ml/worktree'
authorJunio C Hamano <gitster@pobox.com>
Sun, 1 Jul 2007 20:11:01 +0000 (13:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 1 Jul 2007 20:11:01 +0000 (13:11 -0700)
commit96c48153c9a2905fb2f1d588c11e36272635cb79
tree68b20018d8261b392b8a3aeee34ebc37811cd5cd
parent0305b636542c8c137ed7c82fee90db8d3621118c
parent4394efecfa9f94ad14fe49bc9f499c5806aa83af
Merge branch 'ml/worktree'

* ml/worktree:
  make git barf when an alias changes environment variables
git.c