diff options
| author | Junio C Hamano <junio@kernel.org> | 2011-03-20 19:42:22 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2011-03-20 19:42:22 +0000 |
| commit | d2c978f6be36b38127b58af46e28e3ae590b2d3b (patch) | |
| tree | 88d8b45014f2b361e18b1aa71f48160ad7f5dc3f /merge-options.txt | |
| parent | fa28cb14513978502ac466090afe34c3479fc90b (diff) | |
| download | git-htmldocs-d2c978f6be36b38127b58af46e28e3ae590b2d3b.tar.gz | |
Autogenerated HTML docs for v1.7.4.1-343-ga91df
Diffstat (limited to 'merge-options.txt')
| -rw-r--r-- | merge-options.txt | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/merge-options.txt b/merge-options.txt index e33e0f8e1..b613d4ed0 100644 --- a/merge-options.txt +++ b/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[] |