Merge branch 'nd/init-restore-env'
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2014 19:22:00 +0000 (12:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2014 19:22:00 +0000 (12:22 -0700)
commitb30adaac5238a611f12c407912b75112ad4cf186
tree595abd7809c349c9a3791583c698af6de25b7a72
parentb7ce583682e26910c98e71d55babd2ed23a006ad
parentc0562611c525bb3c564b79c345fc7e4f9e799e54
Merge branch 'nd/init-restore-env'

Some subcommands do not want to be aliased because of the side
effects that happens while the definitions of the aliases are looked
up from configuration system.

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