diff options
| author | Kevin Bracey <kevin@bracey.fi> | 2013-05-16 17:32:32 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-05-16 20:51:08 +0200 |
| commit | 617f50cbfded66e2b314fc5ae550bf94854bc55e (patch) | |
| tree | 202d9ecbcc356263464b8d071ab1b1f80318c245 | |
| parent | t6111: add parents to tests (diff) | |
| download | git-617f50cbfded66e2b314fc5ae550bf94854bc55e.tar.xz git-617f50cbfded66e2b314fc5ae550bf94854bc55e.zip | |
rev-list-options.txt: correct TREESAME for P
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>
| -rw-r--r-- | Documentation/rev-list-options.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index 3bdbf5e856..50bbff7f0a 100644 --- 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 |