![[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) | ||
| commit | 44bc573436c98b7c6cd798af04c538f6e76f0f6e | |
| tree | c4dbc1ac7a92ef12098c0e7676ed1ee41a8f60f0 | tree | snapshot |
| parent | 485cdb9bd8bd7de6c7099c1c3e9c6fca6a60fdd3 | commit | diff |
| parent | 8e848868fff625a8dda92fb11edf2b7975827e1a | commit | diff |
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
* 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 | diff1 | | diff2 | | blob | history |