Autogenerated HTML docs for v1.9.1-506-g7bf27

1 files changed, 4 insertions, 4 deletions

diff --git a/git-diff-tree.html b/git-diff-tree.html
index a2d8c9b8c..d771ac593 100644
--- a/git-diff-tree.html
+++ b/git-diff-tree.html
@@ -1333,7 +1333,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,

@@ -1802,7 +1802,7 @@ people using 80-column terminals.</p></div>
         Show the notes (see <a href="git-notes.html">git-notes(1)</a>) that annotate the

         commit, when showing the commit log message.  This is the default

         for <tt>git log</tt>, <tt>git show</tt> and <tt>git whatchanged</tt> commands when

-        there is no <tt>--pretty</tt>, <tt>--format</tt> nor <tt>--oneline</tt> option given

+        there is no <tt>--pretty</tt>, <tt>--format</tt>, or <tt>--oneline</tt> option given

         on the command line.

 </p>

 <div class="paragraph"><p>By default, the notes shown are from the notes refs listed in the

@@ -2026,7 +2026,7 @@ Subject: [PATCH] &lt;title line&gt;</tt></pre>
 stored in the commit object.  Notably, the SHA-1s are

 displayed in full, regardless of whether --abbrev or

 --no-abbrev are used, and <em>parents</em> information show the

-true parent commits, without taking grafts nor history

+true parent commits, without taking grafts or history

 simplification into account.</p></div>

 </li>

 <li>

@@ -2895,7 +2895,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