diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-04-03 22:53:11 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-03 22:53:11 +0200 |
| commit | 44bc573436c98b7c6cd798af04c538f6e76f0f6e (patch) | |
| tree | c4dbc1ac7a92ef12098c0e7676ed1ee41a8f60f0 /parse-options.c | |
| parent | git.el: Don't use font-lock-compile-keywords (diff) | |
| parent | Start preparing for 1.7.4.4 (diff) | |
| download | git-44bc573436c98b7c6cd798af04c538f6e76f0f6e.tar.xz git-44bc573436c98b7c6cd798af04c538f6e76f0f6e.zip | |
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
Diffstat (limited to 'parse-options.c')
0 files changed, 0 insertions, 0 deletions