Code

Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Sun, 3 Apr 2011 20:53:11 +0000 (13:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 3 Apr 2011 20:53:11 +0000 (13:53 -0700)
commit44bc573436c98b7c6cd798af04c538f6e76f0f6e
treec4dbc1ac7a92ef12098c0e7676ed1ee41a8f60f0
parent485cdb9bd8bd7de6c7099c1c3e9c6fca6a60fdd3
parent8e848868fff625a8dda92fb11edf2b7975827e1a
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
git-compat-util.h