projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 485cdb9 8e84886)
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)
* 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

1  2 
git-compat-util.h patch | diff1 | diff2 | blob | history

diff --cc git-compat-util.h
Simple merge
Git—the stupid content tracker