summaryrefslogtreecommitdiff
path: root/unimplemented.sh
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2011-02-20 04:56:56 -0500
committerJunio C Hamano <gitster@pobox.com>2011-02-21 10:24:10 -0800
commitbebd2fd77d385f198017fe297a6c79e26b2bf61c (patch)
treebb19b5bfdf9aebe8879864b0b3561d2c7c1b4d4e /unimplemented.sh
parent99bfc6691d79eaffaaf170a8b6584bcfe97863dc (diff)
downloadgit-bebd2fd77d385f198017fe297a6c79e26b2bf61c.tar.gz
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 'unimplemented.sh')
0 files changed, 0 insertions, 0 deletions