summaryrefslogtreecommitdiffstats
path: root/git-show.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-04-30 15:08:10 +0900
committerJunio C Hamano <gitster@pobox.com>2021-04-30 15:08:10 +0900
commit4078a55a6fb467915a2f03f271d1390b97eabc13 (patch)
tree94f9713738bf23d7a7bce9c87937558570412c71 /git-show.html
parent9877648272f630de87aeee2e3a8b7f4ac1ad9c70 (diff)
downloadgit-htmldocs-4078a55a6fb467915a2f03f271d1390b97eabc13.tar.gz
Autogenerated HTML docs for v2.31.1-442-g7e391
Diffstat (limited to 'git-show.html')
-rw-r--r--git-show.html35
1 files changed, 25 insertions, 10 deletions
diff --git a/git-show.html b/git-show.html
index 3c4fdcedb..a7ba39e7f 100644
--- a/git-show.html
+++ b/git-show.html
@@ -1934,7 +1934,7 @@ diff output.</p></div>
</p>
</dd>
<dt class="hdlist1">
---diff-merges=(off|none|first-parent|1|separate|m|combined|c|dense-combined|cc)
+--diff-merges=(off|none|on|first-parent|1|separate|m|combined|c|dense-combined|cc)
</dt>
<dt class="hdlist1">
--no-diff-merges
@@ -1959,6 +1959,24 @@ diff output.</p></div>
</p>
</dd>
<dt class="hdlist1">
+--diff-merges=on
+</dt>
+<dt class="hdlist1">
+--diff-merges=m
+</dt>
+<dt class="hdlist1">
+-m
+</dt>
+<dd>
+<p>
+ This option makes diff output for merge commits to be shown in
+ the default format. <code>-m</code> will produce the output only if <code>-p</code>
+ is given as well. The default format could be changed using
+ <code>log.diffMerges</code> configuration parameter, which default value
+ is <code>separate</code>.
+</p>
+</dd>
+<dt class="hdlist1">
--diff-merges=first-parent
</dt>
<dt class="hdlist1">
@@ -1973,17 +1991,11 @@ diff output.</p></div>
<dt class="hdlist1">
--diff-merges=separate
</dt>
-<dt class="hdlist1">
---diff-merges=m
-</dt>
-<dt class="hdlist1">
--m
-</dt>
<dd>
<p>
This makes merge commits show the full diff with respect to
each of the parents. Separate log entry and diff is generated
- for each parent. <code>-m</code> doesn&#8217;t produce any output without <code>-p</code>.
+ for each parent.
</p>
</dd>
<dt class="hdlist1">
@@ -2398,7 +2410,9 @@ explained for the configuration variable <code>core.quotePath</code> (see
</dt>
<dd>
<p>
- Show only names of changed files.
+ Show only names of changed files. The file names are often encoded in UTF-8.
+ For more information see the discussion about encoding in the <a href="git-log.html">git-log(1)</a>
+ manual page.
</p>
</dd>
<dt class="hdlist1">
@@ -2408,6 +2422,7 @@ explained for the configuration variable <code>core.quotePath</code> (see
<p>
Show only names and status of changed files. See the description
of the <code>--diff-filter</code> option on what the status letters mean.
+ Just like <code>--name-only</code> the file names are often encoded in UTF-8.
</p>
</dd>
<dt class="hdlist1">
@@ -3658,7 +3673,7 @@ reversible operation.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2021-02-05 17:34:58 PST
+ 2021-02-06 10:34:58 JST
</div>
</div>
</body>