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 /git-pull.html | |
| parent | fa28cb14513978502ac466090afe34c3479fc90b (diff) | |
| download | git-htmldocs-d2c978f6be36b38127b58af46e28e3ae590b2d3b.tar.gz | |
Autogenerated HTML docs for v1.7.4.1-343-ga91df
Diffstat (limited to 'git-pull.html')
| -rw-r--r-- | git-pull.html | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/git-pull.html b/git-pull.html index 5c37cf816..8472ebbeb 100644 --- a/git-pull.html +++ b/git-pull.html @@ -649,7 +649,7 @@ option can be used to override --squash.</p></div> </dt>
<dd>
<p>
- Operate quietly.
+ Operate quietly. Implies --no-progress.
</p>
</dd>
<dt class="hdlist1">
@@ -663,6 +663,20 @@ option can be used to override --squash.</p></div> Be verbose.
</p>
</dd>
+<dt class="hdlist1">
+--progress
+</dt>
+<dt class="hdlist1">
+--no-progress
+</dt>
+<dd>
+<p>
+ 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.
+</p>
+</dd>
</dl></div>
<div class="dlist"><dl>
<dt class="hdlist1">
|