diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-01-27 13:31:26 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-27 13:31:26 -0800 |
| commit | c5bd79e0cb5f924e05e9e6cdb64a4be2ade572e1 (patch) | |
| tree | 1e2fc163814f8a67de8629f2a39db92f2160c39b /git-pull.html | |
| parent | fd98be8ac969289726bc1df7bab75d2e02ddbaa7 (diff) | |
| download | git-htmldocs-c5bd79e0cb5f924e05e9e6cdb64a4be2ade572e1.tar.gz | |
Autogenerated HTML docs for v1.9-rc1
Diffstat (limited to 'git-pull.html')
| -rw-r--r-- | git-pull.html | 44 |
1 files changed, 2 insertions, 42 deletions
diff --git a/git-pull.html b/git-pull.html index 41e38cb7b..9250e92a6 100644 --- a/git-pull.html +++ b/git-pull.html @@ -885,9 +885,7 @@ inspect and further tweak the merge result before committing.</p></div> further edit the auto-generated merge message, so that the user
can explain and justify the merge. The <tt>--no-edit</tt> option can be
used to accept the auto-generated message (this is generally
- discouraged). The <tt>--edit</tt> (or <tt>-e</tt>) option is still useful if you are
- giving a draft message with the <tt>-m</tt> option from the command line
- and want to edit it in the editor.
+ discouraged).
</p>
<div class="paragraph"><p>Older scripts may depend on the historical behaviour of not allowing the
user to edit the merge log message. They will see an editor opened when
@@ -1029,44 +1027,6 @@ option can be used to override --squash.</p></div> </p>
</dd>
<dt class="hdlist1">
--q
-</dt>
-<dt class="hdlist1">
---quiet
-</dt>
-<dd>
-<p>
- Operate quietly. Implies --no-progress.
-</p>
-</dd>
-<dt class="hdlist1">
--v
-</dt>
-<dt class="hdlist1">
---verbose
-</dt>
-<dd>
-<p>
- 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">
-r
</dt>
<dt class="hdlist1">
@@ -1915,7 +1875,7 @@ version.</p></div> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-11-06 15:55:05 PST
+Last updated 2014-01-27 13:30:07 PST
</div>
</div>
</body>
|