diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-04-08 12:48:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-08 12:48:38 -0700 |
| commit | d75148af8e54fe1d655796c75a601e5f79804808 (patch) | |
| tree | 1aed2433cb2e2d7db853a72387f48ec081ce01dc /git-diff.html | |
| parent | 624dd4c072be7e13e57519eb729f35089386fec9 (diff) | |
| download | git-htmldocs-d75148af8e54fe1d655796c75a601e5f79804808.tar.gz | |
Autogenerated HTML docs for v1.9.1-506-g7bf27
Diffstat (limited to 'git-diff.html')
| -rw-r--r-- | git-diff.html | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/git-diff.html b/git-diff.html index 625498319..aa87aa332 100644 --- a/git-diff.html +++ b/git-diff.html @@ -1442,7 +1442,7 @@ another file.</p></div> <p>
Omit the preimage for deletes, i.e. print only the header but not
the diff between the preimage and <tt>/dev/null</tt>. The resulting patch
- is not meant to be applied with <tt>patch</tt> nor <tt>git apply</tt>; this is
+ is not meant to be applied with <tt>patch</tt> or <tt>git apply</tt>; this is
solely for people who want to just concentrate on reviewing the
text after the change. In addition, the output obviously lack
enough information to apply such a patch in reverse, even manually,
@@ -2195,7 +2195,7 @@ added, from the point of view of that parent).</p></div> <div class="paragraph"><p>In the above example output, the function signature was changed
from both files (hence two <tt>-</tt> removals from both file1 and
file2, plus <tt>++</tt> to mean one line that was added does not appear
-in either file1 nor file2). Also eight other lines are the same
+in either file1 or file2). Also eight other lines are the same
from file1 but do not appear in file2 (hence prefixed with <tt>+</tt>).</p></div>
<div class="paragraph"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a
merge commit with the merge result (i.e. file1..fileN are the
@@ -2429,8 +2429,8 @@ $ git diff arch/i386 include/asm-i386 <b><3></b></tt></pre> <div class="colist arabic"><ol>
<li>
<p>
-Show only modification, rename and copy, but not addition
-nor deletion.
+Show only modification, rename, and copy, but not addition
+or deletion.
</p>
</li>
<li>
@@ -2493,7 +2493,7 @@ Output diff in reverse. <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2014-02-07 12:30:09 PST
+Last updated 2014-04-08 12:47:26 PDT
</div>
</div>
</body>
|