summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2011-02-20 09:53:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-02-21 18:24:08 (GMT)
commit99bfc6691d79eaffaaf170a8b6584bcfe97863dc (patch)
tree73ccfdfe22ca3affd0b7b9ab70e0c1697be1716b /Documentation/merge-options.txt
parent3ac942d42ebb1fb48e70d3e5a714d06396e3e2c6 (diff)
downloadgit-99bfc6691d79eaffaaf170a8b6584bcfe97863dc.zip
git-99bfc6691d79eaffaaf170a8b6584bcfe97863dc.tar.gz
git-99bfc6691d79eaffaaf170a8b6584bcfe97863dc.tar.bz2
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 'Documentation/merge-options.txt')
-rw-r--r--Documentation/merge-options.txt10
1 files changed, 9 insertions, 1 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index e33e0f8..b613d4e 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -75,9 +75,17 @@ option can be used to override --squash.
ifndef::git-pull[]
-q::
--quiet::
- Operate quietly.
+ Operate quietly. Implies --no-progress.
-v::
--verbose::
Be verbose.
+
+--progress::
+--no-progress::
+ Turn progress on/off explicitly. If neither is specified,
+ progress is shown if standard error is connected to a terminal.
+ Note that not all merge strategies may support progress
+ reporting.
+
endif::git-pull[]