diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-03-15 14:22:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-15 14:22:23 -0700 |
| commit | 674ef90904fe651ecacafc4211a8a24014160207 (patch) | |
| tree | da07f0f6663799582fffd716e3e5b5f094a6b390 /git-merge-resolve.sh | |
| parent | Merge branch 'jc/checkout-orphan-warning' (diff) | |
| parent | sha1_file.c: Don't retain open fds on small packs (diff) | |
| download | tgif-674ef90904fe651ecacafc4211a8a24014160207.tar.xz | |
Merge branch 'sp/maint-fd-limit'
* sp/maint-fd-limit:
sha1_file.c: Don't retain open fds on small packs
mingw: add minimum getrlimit() compatibility stub
Limit file descriptors used by packs
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions