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-rev-list.html | |
parent | 624dd4c072be7e13e57519eb729f35089386fec9 (diff) | |
download | git-htmldocs-d75148af8e54fe1d655796c75a601e5f79804808.tar.gz |
Autogenerated HTML docs for v1.9.1-506-g7bf27
Diffstat (limited to 'git-rev-list.html')
-rw-r--r-- | git-rev-list.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-rev-list.html b/git-rev-list.html index 859f335f7..752898815 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -1263,7 +1263,7 @@ list.</p></div> reflog entries from the most recent one to older ones.
When this option is used you cannot specify commits to
exclude (that is, <em>^commit</em>, <em>commit1..commit2</em>,
- nor <em>commit1...commit2</em> notations cannot be used).
+ and <em>commit1...commit2</em> notations cannot be used).
</p>
<div class="paragraph"><p>With <tt>--pretty</tt> format other than <tt>oneline</tt> (for obvious reasons),
this causes the output to have two extra lines of information
@@ -1937,7 +1937,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
@@ -2249,7 +2249,7 @@ Subject: [PATCH] <title line></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>
|