diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-05-02 15:02:46 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-05-02 15:02:46 -0700 |
commit | b76a68630eaab75c4eb1c41f0fc091811854ff43 (patch) | |
tree | 5be60264e80970f60d9c56b410c8828693be8588 /git-rev-list.html | |
parent | 0aadbc37c068365a09926cd895863c4a725b45d6 (diff) | |
download | git-htmldocs-b76a68630eaab75c4eb1c41f0fc091811854ff43.tar.gz |
Autogenerated HTML docs for v1.7.10.1-433-g34875
Diffstat (limited to 'git-rev-list.html')
-rw-r--r-- | git-rev-list.html | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/git-rev-list.html b/git-rev-list.html index 135d06ca7..e797173d8 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -993,9 +993,9 @@ excluded from the output.</p></div> i.e. only those which would be marked <tt><</tt> resp. <tt>></tt> by
<tt>--left-right</tt>.
</p>
-<div class="paragraph"><p>For example, <tt>--cherry-pick --right-only A…B</tt> omits those
+<div class="paragraph"><p>For example, <tt>--cherry-pick --right-only A...B</tt> omits those
commits from <tt>B</tt> which are in <tt>A</tt> or are patch-equivalent to a commit in
-<tt>A</tt>. In other words, this lists the <tt>+</tt> commits from <tt>git cherry A B</tt>.
+<tt>A</tt>. In other words, this lists the <tt>+</tt> commits from <tt>git cherry A B</tt>.
More precisely, <tt>--cherry-pick --right-only --no-merges</tt> gives the exact
list.</p></div>
</dd>
@@ -1007,7 +1007,7 @@ list.</p></div> A synonym for <tt>--right-only --cherry-mark --no-merges</tt>; useful to
limit the output to the commits on our side and mark those that
have been applied to the other side of a forked history with
- <tt>git log --cherry upstream…mybranch</tt>, similar to
+ <tt>git log --cherry upstream...mybranch</tt>, similar to
<tt>git cherry upstream mybranch</tt>.
</p>
</dd>
@@ -1306,24 +1306,24 @@ sides of the merge are never walked.</p></div> First, build a history graph in the same way that
<em>--full-history</em> with parent rewriting does (see above).
</p>
-<div class="paragraph"><p>Then simplify each commit ‘C` to its replacement <tt>C’</tt> in the final
+<div class="paragraph"><p>Then simplify each commit <tt>C</tt> to its replacement <tt>C'</tt> in the final
history according to the following rules:</p></div>
<div class="ulist"><ul>
<li>
<p>
-Set ‘C’` to <tt>C</tt>.
+Set <tt>C'</tt> to <tt>C</tt>.
</p>
</li>
<li>
<p>
-Replace each parent ‘P` of <tt>C’</tt> with its simplification ‘P’`. In
+Replace each parent <tt>P</tt> of <tt>C'</tt> with its simplification <tt>P'</tt>. In
the process, drop parents that are ancestors of other parents, and
remove duplicates.
</p>
</li>
<li>
<p>
-If after this parent rewriting, ‘C’` is a root or merge commit (has
+If after this parent rewriting, <tt>C'</tt> is a root or merge commit (has
zero or >1 parents), a boundary commit, or !TREESAME, it remains.
Otherwise, it is replaced with its only parent.
</p>
@@ -2194,7 +2194,7 @@ insert an empty string unless we are traversing reflog entries (e.g., by format if <tt>--decorate</tt> was not already provided on the command line.</td>
</tr></table>
</div>
-<div class="paragraph"><p>If you add a <tt>+</tt> (plus sign) after <em>%</em> of a placeholder, a line-feed
+<div class="paragraph"><p>If you add a <tt>+</tt> (plus sign) after <em>%</em> of a placeholder, a line-feed
is inserted immediately before the expansion if and only if the
placeholder expands to a non-empty string.</p></div>
<div class="paragraph"><p>If you add a <tt>-</tt> (minus sign) after <em>%</em> of a placeholder, line-feeds that
|