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 /builtin-send-pack.c | |
| 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 'builtin-send-pack.c')
| -rw-r--r-- | builtin-send-pack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-send-pack.c b/builtin-send-pack.c index d26997bcf..8fffdbf20 100644 --- a/builtin-send-pack.c +++ b/builtin-send-pack.c @@ -40,7 +40,7 @@ static int pack_objects(int fd, struct ref *refs, struct extra_have_objects *ext */ const char *argv[] = { "pack-objects", - "--all-progress", + "--all-progress-implied", "--revs", "--stdout", NULL, |