![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 24 Nov 2009 05:54:39 +0000 (21:54 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 24 Nov 2009 05:54:39 +0000 (21:54 -0800) | ||
| commit | 75a7ea258c0644b79e57cab3a345807f4017dfd2 | |
| tree | 0d55ddcfcbf550dc552a55c9ce15847d1c17114d | tree | snapshot |
| parent | 483106089aea7ad856b7f940e20db254b08bad81 | commit | diff |
| parent | 4f366275189c06ec26c01ee5ace2f3831b2aa46a | commit | diff |
Merge branch 'maint'
* maint:
pack-objects: split implications of --all-progress from progress activation
instaweb: restart server if already running
prune-packed: only show progress when stderr is a tty
Conflicts:
builtin-pack-objects.c
* maint:
pack-objects: split implications of --all-progress from progress activation
instaweb: restart server if already running
prune-packed: only show progress when stderr is a tty
Conflicts:
builtin-pack-objects.c
| builtin-pack-objects.c | diff1 | | diff2 | | blob | history |
| builtin-send-pack.c | diff1 | | diff2 | | blob | history |
| git-instaweb.sh | diff1 | | diff2 | | blob | history |