![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 3 Apr 2011 20:53:11 +0000 (13:53 -0700) | ||
| committer | Junio 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
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