diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-10-30 08:44:11 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-30 08:44:11 +0900 |
| commit | 918a697459a240f82a16fba9fe7a606ed1d9c2a9 (patch) | |
| tree | 0ebdc5c599739be4b2c4fa4ebf0cfc1ebbbff565 /git-show.html | |
| parent | 33be82183d4cd6dc645f64da1402cf9a3f4cdbf3 (diff) | |
| download | git-htmldocs-918a697459a240f82a16fba9fe7a606ed1d9c2a9.tar.gz | |
Autogenerated HTML docs for v2.42.0-526-g3130c1
Diffstat (limited to 'git-show.html')
| -rw-r--r-- | git-show.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-show.html b/git-show.html index 16cf6407e..80b3fd1a4 100644 --- a/git-show.html +++ b/git-show.html @@ -2109,7 +2109,7 @@ on, m <dd>
<p>
Make diff output for merge commits to be shown in the default
- format. The default format could be changed using
+ format. The default format can be changed using
<code>log.diffMerges</code> configuration variable, whose default value
is <code>separate</code>.
</p>
@@ -2532,7 +2532,7 @@ and accumulating child directory counts in the parent directories: </dt>
<dd>
<p>
- Separate the commits with NULs instead of with new newlines.
+ Separate the commits with NULs instead of newlines.
</p>
<div class="paragraph"><p>Also, when <code>--raw</code> or <code>--numstat</code> has been given, do not munge
pathnames and use NULs as output field terminators.</p></div>
@@ -3829,7 +3829,7 @@ reversible operation.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2023-10-23 14:43:46 PDT
+ 2023-10-24 06:43:46 JST
</div>
</div>
</body>
|