From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 20 Dec 2010 02:14:45 +0000 (-0800)
Subject: Merge branch 'master' into next
X-Git-Tag: ko-next~57
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0e245817027861b26d160873863df0caf8748e36;p=git.git

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.
---

0e245817027861b26d160873863df0caf8748e36