diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-12-01 23:45:01 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-12-01 23:45:01 +0900 |
| commit | f2b280bfddf499d26c09ad311b501d9b699dbf94 (patch) | |
| tree | 7392101d12a8ec2556fda7ff800263d78505c6d5 /git-diff-index.html | |
| parent | 44db56fdf11bad8e1fcf3fa225c1915c40b3b5d6 (diff) | |
| download | git-htmldocs-f2b280bfddf499d26c09ad311b501d9b699dbf94.tar.gz | |
Autogenerated HTML docs for v2.20.0-rc2
Diffstat (limited to 'git-diff-index.html')
| -rw-r--r-- | git-diff-index.html | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/git-diff-index.html b/git-diff-index.html index a216c6ac9..dff1ba6b9 100644 --- a/git-diff-index.html +++ b/git-diff-index.html @@ -1993,12 +1993,12 @@ line per changed file.</p></div> <div class="paragraph"><p>An output line is formatted this way:</p></div>
<div class="listingblock">
<div class="content">
-<pre><code>in-place edit :100644 100644 bcd1234... 0123456... M file0
-copy-edit :100644 100644 abcd123... 1234567... C68 file1 file2
-rename-edit :100644 100644 abcd123... 1234567... R86 file1 file3
-create :000000 100644 0000000... 1234567... A file4
-delete :100644 000000 1234567... 0000000... D file5
-unmerged :000000 000000 0000000... 0000000... U file6</code></pre>
+<pre><code>in-place edit :100644 100644 bcd1234 0123456 M file0
+copy-edit :100644 100644 abcd123 1234567 C68 file1 file2
+rename-edit :100644 100644 abcd123 1234567 R86 file1 file3
+create :000000 100644 0000000 1234567 A file4
+delete :100644 000000 1234567 0000000 D file5
+unmerged :000000 000000 0000000 0000000 U file6</code></pre>
</div></div>
<div class="paragraph"><p>That is, from the left to the right:</p></div>
<div class="olist arabic"><ol class="arabic">
@@ -2131,7 +2131,7 @@ and it is out of sync with the index.</p></div> <div class="paragraph"><p>Example:</p></div>
<div class="listingblock">
<div class="content">
-<pre><code>:100644 100644 5be4a4...... 000000...... M file.c</code></pre>
+<pre><code>:100644 100644 5be4a4a 0000000 M file.c</code></pre>
</div></div>
<div class="paragraph"><p>Without the <code>-z</code> option, pathnames with "unusual" characters are
quoted as explained for the configuration variable <code>core.quotePath</code>
@@ -2176,7 +2176,7 @@ single path, only for "dst" <div class="paragraph"><p>Example:</p></div>
<div class="listingblock">
<div class="content">
-<pre><code>::100644 100644 100644 fabadb8... cc95eb0... 4866510... MM describe.c</code></pre>
+<pre><code>::100644 100644 100644 fabadb8 cc95eb0 4866510 MM describe.c</code></pre>
</div></div>
<div class="paragraph"><p>Note that <em>combined diff</em> lists only files which were modified from
all parents.</p></div>
|