diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-11-23 21:54:39 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-11-23 21:54:39 -0800 |
commit | 75a7ea258c0644b79e57cab3a345807f4017dfd2 (patch) | |
tree | 0d55ddcfcbf550dc552a55c9ce15847d1c17114d /notes.h | |
parent | 483106089aea7ad856b7f940e20db254b08bad81 (diff) | |
parent | 4f366275189c06ec26c01ee5ace2f3831b2aa46a (diff) | |
download | git-75a7ea258c0644b79e57cab3a345807f4017dfd2.tar.gz git-75a7ea258c0644b79e57cab3a345807f4017dfd2.tar.xz |
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
Diffstat (limited to 'notes.h')
0 files changed, 0 insertions, 0 deletions