Skip to content

Commit 2c14c8d

Browse files
author
Junio C Hamano
committed
Autogenerated HTML docs for v1.6.3.3-385-g60647
1 parent 73d812c commit 2c14c8d

8 files changed

Lines changed: 56 additions & 26 deletions

File tree

git-am.html

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ <h2>SYNOPSIS</h2>
325325
[--3way] [--interactive] [--committer-date-is-author-date]
326326
[--ignore-date]
327327
[--whitespace=&lt;option&gt;] [-C&lt;n&gt;] [-p&lt;n&gt;] [--directory=&lt;dir&gt;]
328-
[--reject]
328+
[--reject] [-q | --quiet]
329329
[&lt;mbox&gt; | &lt;Maildir&gt;&#8230;]
330330
<em>git am</em> (--skip | --resolved | --abort)</div></div>
331331
</div>
@@ -372,6 +372,17 @@ <h2 id="_options">OPTIONS</h2>
372372
</p>
373373
</dd>
374374
<dt>
375+
-q
376+
</dt>
377+
<dt>
378+
--quiet
379+
</dt>
380+
<dd>
381+
<p>
382+
Be quiet. Only print error messages.
383+
</p>
384+
</dd>
385+
<dt>
375386
-u
376387
</dt>
377388
<dt>
@@ -598,7 +609,7 @@ <h2 id="_git">GIT</h2>
598609
</div>
599610
<div id="footer">
600611
<div id="footer-text">
601-
Last updated 2009-07-01 02:30:41 UTC
612+
Last updated 2009-07-02 03:16:40 UTC
602613
</div>
603614
</div>
604615
</body>

git-am.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ SYNOPSIS
1313
[--3way] [--interactive] [--committer-date-is-author-date]
1414
[--ignore-date]
1515
[--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
16-
[--reject]
16+
[--reject] [-q | --quiet]
1717
[<mbox> | <Maildir>...]
1818
'git am' (--skip | --resolved | --abort)
1919

@@ -39,6 +39,10 @@ OPTIONS
3939
--keep::
4040
Pass `-k` flag to 'git-mailinfo' (see linkgit:git-mailinfo[1]).
4141

42+
-q::
43+
--quiet::
44+
Be quiet. Only print error messages.
45+
4246
-u::
4347
--utf8::
4448
Pass `-u` flag to 'git-mailinfo' (see linkgit:git-mailinfo[1]).

git-bisect.html

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -444,9 +444,8 @@ <h3 id="_bisect_skip">Bisect skip</h3><div style="clear:left"></div>
444444
<div class="content">
445445
<pre><tt>$ git bisect skip # Current version cannot be tested</tt></pre>
446446
</div></div>
447-
<div class="para"><p>But computing the commit to test may be slower afterwards and git may
448-
eventually not be able to tell the first bad commit among a bad commit
449-
and one or more skipped commits.</p></div>
447+
<div class="para"><p>But git may eventually be unable to tell the first bad commit among
448+
a bad commit and one or more skipped commits.</p></div>
450449
<div class="para"><p>You can even skip a range of commits, instead of just one commit,
451450
using the "<em>&lt;commit1&gt;</em>..<em>&lt;commit2&gt;</em>" notation. For example:</p></div>
452451
<div class="listingblock">
@@ -600,7 +599,7 @@ <h2 id="_git">GIT</h2>
600599
</div>
601600
<div id="footer">
602601
<div id="footer-text">
603-
Last updated 2009-07-01 02:30:43 UTC
602+
Last updated 2009-07-02 03:16:40 UTC
604603
</div>
605604
</div>
606605
</body>

git-bisect.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,8 @@ to do it for you by issuing the command:
164164
$ git bisect skip # Current version cannot be tested
165165
------------
166166

167-
But computing the commit to test may be slower afterwards and git may
168-
eventually not be able to tell the first bad commit among a bad commit
169-
and one or more skipped commits.
167+
But git may eventually be unable to tell the first bad commit among
168+
a bad commit and one or more skipped commits.
170169

171170
You can even skip a range of commits, instead of just one commit,
172171
using the "'<commit1>'..'<commit2>'" notation. For example:

git-rebase.html

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -583,6 +583,17 @@ <h2 id="_options">OPTIONS</h2>
583583
</p>
584584
</dd>
585585
<dt>
586+
-q
587+
</dt>
588+
<dt>
589+
--quiet
590+
</dt>
591+
<dd>
592+
<p>
593+
Be quiet. Implies --no-stat.
594+
</p>
595+
</dd>
596+
<dt>
586597
-v
587598
</dt>
588599
<dt>
@@ -1116,7 +1127,7 @@ <h2 id="_git">GIT</h2>
11161127
</div>
11171128
<div id="footer">
11181129
<div id="footer-text">
1119-
Last updated 2009-07-01 02:30:59 UTC
1130+
Last updated 2009-07-02 03:16:40 UTC
11201131
</div>
11211132
</div>
11221133
</body>

git-rebase.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,10 @@ OPTIONS
236236
is used instead ('git-merge-recursive' when merging a single
237237
head, 'git-merge-octopus' otherwise). This implies --merge.
238238

239+
-q::
240+
--quiet::
241+
Be quiet. Implies --no-stat.
242+
239243
-v::
240244
--verbose::
241245
Be verbose. Implies --stat.

git-stash.html

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -322,10 +322,11 @@ <h2>SYNOPSIS</h2>
322322
<div class="sectionbody">
323323
<div class="verseblock">
324324
<div class="content"><em>git stash</em> list [&lt;options&gt;]
325-
<em>git stash</em> ( show | drop ) [&lt;stash&gt;]
326-
<em>git stash</em> ( pop | apply ) [--index] [&lt;stash&gt;]
325+
<em>git stash</em> show [&lt;stash&gt;]
326+
<em>git stash</em> drop [-q|--quiet] [&lt;stash&gt;]
327+
<em>git stash</em> ( pop | apply ) [--index] [-q|--quiet] [&lt;stash&gt;]
327328
<em>git stash</em> branch &lt;branchname&gt; [&lt;stash&gt;]
328-
<em>git stash</em> [save [--keep-index] [&lt;message&gt;]]
329+
<em>git stash</em> [save [--keep-index] [-q|--quiet] [&lt;message&gt;]]
329330
<em>git stash</em> clear
330331
<em>git stash</em> create</div></div>
331332
</div>
@@ -352,7 +353,7 @@ <h2 id="_options">OPTIONS</h2>
352353
<div class="sectionbody">
353354
<div class="vlist"><dl>
354355
<dt>
355-
save [--keep-index] [&lt;message&gt;]
356+
save [--keep-index] [-q|--quiet] [&lt;message&gt;]
356357
</dt>
357358
<dd>
358359
<p>
@@ -396,7 +397,7 @@ <h2 id="_options">OPTIONS</h2>
396397
</p>
397398
</dd>
398399
<dt>
399-
pop [&lt;stash&gt;]
400+
pop [--index] [-q|--quiet] [&lt;stash&gt;]
400401
</dt>
401402
<dd>
402403
<p>
@@ -415,7 +416,7 @@ <h2 id="_options">OPTIONS</h2>
415416
<div class="para"><p>When no <tt>&lt;stash&gt;</tt> is given, <tt>stash@{0}</tt> is assumed.</p></div>
416417
</dd>
417418
<dt>
418-
apply [--index] [&lt;stash&gt;]
419+
apply [--index] [-q|--quiet] [&lt;stash&gt;]
419420
</dt>
420421
<dd>
421422
<p>
@@ -449,7 +450,7 @@ <h2 id="_options">OPTIONS</h2>
449450
</p>
450451
</dd>
451452
<dt>
452-
drop [&lt;stash&gt;]
453+
drop [-q|--quiet] [&lt;stash&gt;]
453454
</dt>
454455
<dd>
455456
<p>
@@ -586,7 +587,7 @@ <h2 id="_git">GIT</h2>
586587
</div>
587588
<div id="footer">
588589
<div id="footer-text">
589-
Last updated 2009-07-01 02:31:04 UTC
590+
Last updated 2009-07-02 03:16:40 UTC
590591
</div>
591592
</div>
592593
</body>

git-stash.txt

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@ SYNOPSIS
99
--------
1010
[verse]
1111
'git stash' list [<options>]
12-
'git stash' ( show | drop ) [<stash>]
13-
'git stash' ( pop | apply ) [--index] [<stash>]
12+
'git stash' show [<stash>]
13+
'git stash' drop [-q|--quiet] [<stash>]
14+
'git stash' ( pop | apply ) [--index] [-q|--quiet] [<stash>]
1415
'git stash' branch <branchname> [<stash>]
15-
'git stash' [save [--keep-index] [<message>]]
16+
'git stash' [save [--keep-index] [-q|--quiet] [<message>]]
1617
'git stash' clear
1718
'git stash' create
1819

@@ -41,7 +42,7 @@ is also possible).
4142
OPTIONS
4243
-------
4344

44-
save [--keep-index] [<message>]::
45+
save [--keep-index] [-q|--quiet] [<message>]::
4546

4647
Save your local modifications to a new 'stash', and run `git reset
4748
--hard` to revert them. This is the default action when no
@@ -75,7 +76,7 @@ show [<stash>]::
7576
it will accept any format known to 'git-diff' (e.g., `git stash show
7677
-p stash@\{1}` to view the second most recent stash in patch form).
7778

78-
pop [<stash>]::
79+
pop [--index] [-q|--quiet] [<stash>]::
7980

8081
Remove a single stashed state from the stash list and apply it
8182
on top of the current working tree state, i.e., do the inverse
@@ -93,7 +94,7 @@ longer apply the changes as they were originally).
9394
+
9495
When no `<stash>` is given, `stash@\{0}` is assumed.
9596

96-
apply [--index] [<stash>]::
97+
apply [--index] [-q|--quiet] [<stash>]::
9798

9899
Like `pop`, but do not remove the state from the stash list.
99100

@@ -115,7 +116,7 @@ clear::
115116
Remove all the stashed states. Note that those states will then
116117
be subject to pruning, and may be difficult or impossible to recover.
117118

118-
drop [<stash>]::
119+
drop [-q|--quiet] [<stash>]::
119120

120121
Remove a single stashed state from the stash list. When no `<stash>`
121122
is given, it removes the latest one. i.e. `stash@\{0}`

0 commit comments

Comments
 (0)