diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-05-25 19:03:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-25 19:03:20 -0700 |
| commit | 417653777a1d073f53b2053cf0b0838a35cfc7d5 (patch) | |
| tree | 6ff1bd8c1dbfb3cd047dd96dbd1ed5dcaac08d24 /merge-recursive.c | |
| parent | Merge branch 'np/push-delta' into maint (diff) | |
| parent | fix GIT_TRACE segfault with shell-quoted aliases (diff) | |
| download | tgif-417653777a1d073f53b2053cf0b0838a35cfc7d5.tar.xz | |
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
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions