diff options
| author | Jeff King <peff@peff.net> | 2011-02-20 09:56:56 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-21 18:24:10 (GMT) |
| commit | bebd2fd77d385f198017fe297a6c79e26b2bf61c (patch) | |
| tree | bb19b5bfdf9aebe8879864b0b3561d2c7c1b4d4e /merge-recursive.h | |
| parent | 99bfc6691d79eaffaaf170a8b6584bcfe97863dc (diff) | |
| download | git-bebd2fd77d385f198017fe297a6c79e26b2bf61c.zip git-bebd2fd77d385f198017fe297a6c79e26b2bf61c.tar.gz git-bebd2fd77d385f198017fe297a6c79e26b2bf61c.tar.bz2 | |
pull: propagate --progress to merge
Now that merge understands progress, we should pass it
along. While we're at it, pass along --no-progress, too.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions