summaryrefslogtreecommitdiffstats
path: root/rev-list-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-05-02 15:02:46 -0700
committerJunio C Hamano <gitster@pobox.com>2012-05-02 15:02:46 -0700
commitb76a68630eaab75c4eb1c41f0fc091811854ff43 (patch)
tree5be60264e80970f60d9c56b410c8828693be8588 /rev-list-options.txt
parent0aadbc37c068365a09926cd895863c4a725b45d6 (diff)
downloadgit-htmldocs-b76a68630eaab75c4eb1c41f0fc091811854ff43.tar.gz
Autogenerated HTML docs for v1.7.10.1-433-g34875
Diffstat (limited to 'rev-list-options.txt')
-rw-r--r--rev-list-options.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/rev-list-options.txt b/rev-list-options.txt
index 6a4b6355b..1ae3c899e 100644
--- a/rev-list-options.txt
+++ b/rev-list-options.txt
@@ -198,7 +198,7 @@ excluded from the output.
+
For example, `--cherry-pick --right-only A...B` omits those
commits from `B` which are in `A` or are patch-equivalent to a commit in
-`A`. In other words, this lists the `{plus}` commits from `git cherry A B`.
+`A`. In other words, this lists the `+` commits from `git cherry A B`.
More precisely, `--cherry-pick --right-only --no-merges` gives the exact
list.
@@ -455,7 +455,7 @@ The effect of this is best shown by way of comparing to
`---------'
-----------------------------------------------------------------------
+
-Note the major differences in `N` and `P` over '\--full-history':
+Note the major differences in `N` and `P` over '--full-history':
+
--
* `N`'s parent list had `I` removed, because it is an ancestor of the
@@ -494,7 +494,7 @@ of course).
When we want to find out what commits in `M` are contaminated with the
bug introduced by `D` and need fixing, however, we might want to view
only the subset of 'D..M' that are actually descendants of `D`, i.e.
-excluding `C` and `K`. This is exactly what the '\--ancestry-path'
+excluding `C` and `K`. This is exactly what the '--ancestry-path'
option does. Applied to the 'D..M' range, it results in:
+
-----------------------------------------------------------------------