From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 25 Jun 2014 19:22:00 +0000 (-0700)
Subject: Merge branch 'nd/init-restore-env'
X-Git-Tag: v2.1.0-rc0~88
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b30adaac5238a611f12c407912b75112ad4cf186;p=thirdparty%2Fgit.git

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
---

b30adaac5238a611f12c407912b75112ad4cf186