Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
rev-list-options.txt: correct TREESAME for P
author
Kevin Bracey
<kevin@bracey.fi>
Thu, 16 May 2013 15:32:32 +0000
(18:32 +0300)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 16 May 2013 18:51:08 +0000
(11:51 -0700)
In the example given, P is not TREESAME to E. This doesn't affect the
current result, but it will matter when we change behaviour.
Signed-off-by: Kevin Bracey <kevin@bracey.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/rev-list-options.txt
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
53e3835
)
diff --git
a/Documentation/rev-list-options.txt
b/Documentation/rev-list-options.txt
index 3bdbf5e856b68692745a91304d80b09186d487b4..50bbff7f0abb776eb1396d6555d2f35bba33e4c7 100644
(file)
--- a/
Documentation/rev-list-options.txt
+++ b/
Documentation/rev-list-options.txt
@@
-367,8
+367,7
@@
each merge. The commits are:
`N` and `D` to "foobarbaz"; i.e., it is not TREESAME to any parent.
* `E` changes `quux` to "xyzzy", and its merge `P` combines the
- strings to "quux xyzzy". Despite appearing interesting, `P` is
- TREESAME to all parents.
+ strings to "quux xyzzy". `P` is TREESAME to `O`, but not to `E`.
'rev-list' walks backwards through history, including or excluding
commits based on whether '\--full-history' and/or parent rewriting