Merge branch 'ml/worktree'

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

diff --cc git.c
Simple merge