diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-12-30 01:24:12 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-30 01:24:12 -0800 |
| commit | b0b3a241e2ca1ba5b928a128b6dcafb990df6e75 (patch) | |
| tree | f0631396a9ce6a1bdd3ef12f2c87cd47a7864cea /builtin-upload-archive.c | |
| parent | Documentation: always respect core.worktree if set (diff) | |
| parent | textconv: stop leaking file descriptors (diff) | |
| download | tgif-b0b3a241e2ca1ba5b928a128b6dcafb990df6e75.tar.xz | |
Merge branch 'maint-1.6.1' into maint
* maint-1.6.1:
textconv: stop leaking file descriptors
commit: --cleanup is a message option
git count-objects: handle packs bigger than 4G
t7102: make the test fail if one of its check fails
Conflicts:
builtin-commit.c
diff.c
Diffstat (limited to 'builtin-upload-archive.c')
0 files changed, 0 insertions, 0 deletions