From: Junio C Hamano Date: Tue, 26 May 2009 02:03:20 +0000 (-0700) Subject: Merge branch 'jk/maint-1.6.0-trace-argv' into maint X-Git-Tag: v1.6.3.2~16 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=417653777a1d073f53b2053cf0b0838a35cfc7d5;p=git.git Merge branch 'jk/maint-1.6.0-trace-argv' into maint * jk/maint-1.6.0-trace-argv: fix GIT_TRACE segfault with shell-quoted aliases Conflicts: alias.c --- 417653777a1d073f53b2053cf0b0838a35cfc7d5