tree bb19b5bfdf9aebe8879864b0b3561d2c7c1b4d4e
parent 99bfc6691d79eaffaaf170a8b6584bcfe97863dc
author Jeff King <peff@peff.net> 1298195816 -0500
committer Junio C Hamano <gitster@pobox.com> 1298312650 -0800

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>