summaryrefslogtreecommitdiffstats
path: root/git-log.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-22 12:20:59 -0700
committerJunio C Hamano <gitster@pobox.com>2013-07-22 12:20:59 -0700
commit58f587aef6ee6b6b759fe8f4dd500f471eee1b88 (patch)
tree5ea60bd475891efacdd8b328c23ec2536cacff88 /git-log.html
parentce5b8accea74b2c2263a82939a32f6ddb2bffc4e (diff)
downloadgit-htmldocs-58f587aef6ee6b6b759fe8f4dd500f471eee1b88.tar.gz
Autogenerated HTML docs for v1.8.3.4-837-g0bde8
Diffstat (limited to 'git-log.html')
-rw-r--r--git-log.html30
1 files changed, 17 insertions, 13 deletions
diff --git a/git-log.html b/git-log.html
index 841d18bf2..98a2ddcde 100644
--- a/git-log.html
+++ b/git-log.html
@@ -2085,14 +2085,6 @@ options may be given. See <a href="git-diff-files.html">git-diff-files(1)</a> fo
Show the tree objects in the diff output. This implies <em>-r</em>.
</p>
</dd>
-<dt class="hdlist1">
--s
-</dt>
-<dd>
-<p>
- Suppress diff output.
-</p>
-</dd>
</dl></div>
</div>
</div>
@@ -2611,7 +2603,7 @@ $ git log -2 --pretty=%h 4da45bef</code></pre>
</div>
</div>
<div class="sect1">
-<h2 id="_common_diff_options">Common diff options</h2>
+<h2 id="_common_diff_options">COMMON DIFF OPTIONS</h2>
<div class="sectionbody">
<div class="dlist"><dl>
<dt class="hdlist1">
@@ -2630,6 +2622,18 @@ $ git log -2 --pretty=%h 4da45bef</code></pre>
</p>
</dd>
<dt class="hdlist1">
+-s
+</dt>
+<dt class="hdlist1">
+--no-patch
+</dt>
+<dd>
+<p>
+ Suppress diff output. Useful for commands like <code>git show</code> that
+ show the patch by default, or to cancel the effect of <code>--patch</code>.
+</p>
+</dd>
+<dt class="hdlist1">
-U&lt;n&gt;
</dt>
<dt class="hdlist1">
@@ -3665,7 +3669,7 @@ two unresolved merge parents with the working tree file
</div>
</div>
<div class="sect1">
-<h2 id="_examples">Examples</h2>
+<h2 id="_examples">EXAMPLES</h2>
<div class="sectionbody">
<div class="dlist"><dl>
<dt class="hdlist1">
@@ -3767,7 +3771,7 @@ two unresolved merge parents with the working tree file
</div>
</div>
<div class="sect1">
-<h2 id="_discussion">Discussion</h2>
+<h2 id="_discussion">DISCUSSION</h2>
<div class="sectionbody">
<div class="paragraph"><p>At the core level, Git is character encoding agnostic.</p></div>
<div class="ulist"><ul>
@@ -3844,7 +3848,7 @@ reversible operation.</p></div>
</div>
</div>
<div class="sect1">
-<h2 id="_configuration">Configuration</h2>
+<h2 id="_configuration">CONFIGURATION</h2>
<div class="sectionbody">
<div class="paragraph"><p>See <a href="git-config.html">git-config(1)</a> for core variables and <a href="git-diff.html">git-diff(1)</a>
for settings related to diff generation.</p></div>
@@ -3927,7 +3931,7 @@ and overridden by the <code>--notes=&lt;ref&gt;</code> option.</p></div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-07-17 19:14:54 PDT
+Last updated 2013-07-22 12:19:08 PDT
</div>
</div>
</body>