From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 3 Apr 2011 20:53:11 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.5-rc1~8
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=44bc573436c98b7c6cd798af04c538f6e76f0f6e;p=git.git

Merge branch 'maint'

* maint:
  Start preparing for 1.7.4.4
  pull: do not clobber untracked files on initial pull
  compat: add missing #include <sys/resource.h>

Conflicts:
	RelNotes
---

44bc573436c98b7c6cd798af04c538f6e76f0f6e