author | Junio C Hamano <gitster@pobox.com> | |
Sat, 23 May 2009 08:39:08 +0000 (01:39 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sat, 23 May 2009 08:39:08 +0000 (01:39 -0700) | ||
commit | 2beba6beb0074afac988594539572865fb37a00f | |
tree | 9b4d4d1aa1b0d9c95aeb8c382156cb7fcb71bee9 | tree | snapshot |
parent | 15d29dde04842d0222cfbc0a8383382ccff9ec21 | commit | diff |
parent | 27d5438d9f4eb2cefc2a989c68f9b42b529b2a12 | commit | diff |
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
* jk/maint-1.6.0-trace-argv:
fix GIT_TRACE segfault with shell-quoted aliases
Conflicts:
alias.c
alias.c | diff1 | | diff2 | | blob | history |