author | Junio C Hamano <gitster@pobox.com> | |
Mon, 20 Dec 2010 02:14:45 +0000 (18:14 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Mon, 20 Dec 2010 02:14:45 +0000 (18:14 -0800) | ||
commit | 0e245817027861b26d160873863df0caf8748e36 | |
tree | 5c95166f3c65dd0566fd96c94560d4d3488ab291 | tree | snapshot |
parent | 987cddb87165104f919f3287f393191042955364 | commit | diff |
parent | f29db856e7a736dd5109223d71c548367bc127ae | commit | diff |
Merge branch 'master' into next
* master:
t9300: use perl "head -c" clone in place of "dd bs=1 count=16000" kluge
builtin/rm.c: Use ALLOC_GROW instead of alloc_nr and xrealloc.
builtin/branch.c: Use ALLOC_GROW instead of alloc_nr and xrealloc.
gitweb: Include links to feeds in HTML header only for '200 OK' response
fsck docs: remove outdated and useless diagnostic
userdiff: fix typo in ruby and python word regexes
trace.c: mark file-local function static
Fix typo in git-gc document.
* master:
t9300: use perl "head -c" clone in place of "dd bs=1 count=16000" kluge
builtin/rm.c: Use ALLOC_GROW instead of alloc_nr and xrealloc.
builtin/branch.c: Use ALLOC_GROW instead of alloc_nr and xrealloc.
gitweb: Include links to feeds in HTML header only for '200 OK' response
fsck docs: remove outdated and useless diagnostic
userdiff: fix typo in ruby and python word regexes
trace.c: mark file-local function static
Fix typo in git-gc document.
gitweb/gitweb.perl | diff1 | | diff2 | | blob | history |