From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 23 May 2009 08:39:08 +0000 (-0700)
Subject: Merge branch 'jk/maint-1.6.0-trace-argv'
X-Git-Tag: v1.6.4-rc0~141
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2beba6beb0074afac988594539572865fb37a00f;p=git.git

Merge branch 'jk/maint-1.6.0-trace-argv'

* jk/maint-1.6.0-trace-argv:
  fix GIT_TRACE segfault with shell-quoted aliases

Conflicts:
	alias.c
---

2beba6beb0074afac988594539572865fb37a00f