Code

Merge branch 'jk/maint-1.6.0-trace-argv' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 26 May 2009 02:03:20 +0000 (19:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 26 May 2009 02:03:20 +0000 (19:03 -0700)
commit417653777a1d073f53b2053cf0b0838a35cfc7d5
tree6ff1bd8c1dbfb3cd047dd96dbd1ed5dcaac08d24
parent4619136c8b52a4c68bc1529faf5cea71d428ac22
parent27d5438d9f4eb2cefc2a989c68f9b42b529b2a12
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
alias.c