Merge branch 'jk/maint-1.6.0-trace-argv'
commit2beba6beb0074afac988594539572865fb37a00f
authorJunio C Hamano <gitster@pobox.com>
Sat, 23 May 2009 08:39:08 +0000 (23 01:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 23 May 2009 08:39:08 +0000 (23 01:39 -0700)
tree9b4d4d1aa1b0d9c95aeb8c382156cb7fcb71bee9
parent15d29dde04842d0222cfbc0a8383382ccff9ec21
parent27d5438d9f4eb2cefc2a989c68f9b42b529b2a12
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
alias.c