| commit | bebd2fd77d385f198017fe297a6c79e26b2bf61c | |
| author | Jeff King <peff@peff.net> | |
| Sun, 20 Feb 2011 09:56:56 +0000 (20 04:56 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 21 Feb 2011 18:24:10 +0000 (21 10:24 -0800) | ||
| tree | bb19b5bfdf9aebe8879864b0b3561d2c7c1b4d4e | treesnapshot (tar.gz zip) |
| parent | 99bfc6691d79eaffaaf170a8b6584bcfe97863dc | commitdiff |
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>
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>
| git-pull.sh | diffblobblamehistory |