summaryrefslogtreecommitdiff
path: root/t/t2201-add-update-typechange.sh
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2011-02-20 04:53:21 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-02-21 10:24:08 -0800
commit99bfc6691d79eaffaaf170a8b6584bcfe97863dc (patch)
tree73ccfdfe22ca3affd0b7b9ab70e0c1697be1716b /t/t2201-add-update-typechange.sh
parentadd inexact rename detection progress infrastructure (diff)
downloadtgif-99bfc6691d79eaffaaf170a8b6584bcfe97863dc.tar.xz
merge: enable progress reporting for rename detection
The user can enable or disable it explicitly with the new --progress, but it defaults to checking isatty(2). This works only with merge-recursive and subtree. In theory we could pass a progress flag to other strategies, but none of them support progress at this point, so let's wait until they grow such a feature before worrying about propagating it. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t2201-add-update-typechange.sh')
0 files changed, 0 insertions, 0 deletions