Merge branch 'nd/init-restore-env' into next
commitecbbfca9f0715a7bd634b0609100ca5781fa3860
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Jun 2014 19:51:59 +0000 (16 12:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Jun 2014 19:51:59 +0000 (16 12:51 -0700)
tree16e895aba63bc3ea482174003b4f44d6534d4122
parent89716c987544fa263705bfe8aa8d6a3ab705ec37
parentc0562611c525bb3c564b79c345fc7e4f9e799e54
Merge branch 'nd/init-restore-env' into next

* nd/init-restore-env:
  git potty: restore environments after alias expansion
git.c
t/t0001-init.sh