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)
* ml/worktree:
  make git barf when an alias changes environment variables

1  2 
git.c

diff --cc git.c
Simple merge