![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 7 Jan 2011 00:40:09 +0000 (16:40 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 7 Jan 2011 00:40:09 +0000 (16:40 -0800) | ||
| commit | 438e47c91da58b27dabd74e3fc24ff71ed37ab58 | |
| tree | 21ed6bdab68fb18a7d974ef9dc6cc11fa1dbe9fe | tree | snapshot |
| parent | 1fbd4a0ce11f96625590f91c4802b2941d14ee6f | commit | diff |
| parent | bc2d159421bb017edc7b8b8d6d5544e1c83073e4 | commit | diff |
Merge branch 'master' into next
* master:
t3032: limit sed branch labels to 8 characters
t0001,t1510,t3301: use sane_unset which always returns with status 0
trace.c: ensure NULL is not passed to printf
* master:
t3032: limit sed branch labels to 8 characters
t0001,t1510,t3301: use sane_unset which always returns with status 0
trace.c: ensure NULL is not passed to printf
| t/t3032-merge-recursive-options.sh | diff1 | | diff2 | | blob | history |