]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 15d29dd 27d5438)
Merge branch 'jk/maint-1.6.0-trace-argv'
authorJunio C Hamano <gitster@pobox.com>
Sat, 23 May 2009 08:39:08 +0000 (01:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 23 May 2009 08:39:08 +0000 (01:39 -0700)
* jk/maint-1.6.0-trace-argv:
  fix GIT_TRACE segfault with shell-quoted aliases

Conflicts:
alias.c

1  2 
alias.c patch | diff1 | diff2 | blob | history

diff --cc alias.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.