summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-05-23 01:39:08 -0700
committerJunio C Hamano <gitster@pobox.com>2009-05-23 01:39:08 -0700
commit2beba6beb0074afac988594539572865fb37a00f (patch)
tree9b4d4d1aa1b0d9c95aeb8c382156cb7fcb71bee9 /templates
parent15d29dde04842d0222cfbc0a8383382ccff9ec21 (diff)
parent27d5438d9f4eb2cefc2a989c68f9b42b529b2a12 (diff)
downloadgit-2beba6beb0074afac988594539572865fb37a00f.tar.gz
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
Diffstat (limited to 'templates')
0 files changed, 0 insertions, 0 deletions