summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Philip Oakley <philipoakley@iee.org>2016-08-12 08:07:47 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-08-13 19:36:44 -0700
commit1afe13b98a9865c012daffca5d0ac56aced318fb (patch)
tree60ab3a1e2dd3b364a352ae397b672df2a08b0c68 /Documentation
parentdoc: revisions - define `reachable` (diff)
downloadtgif-1afe13b98a9865c012daffca5d0ac56aced318fb.tar.xz
doc: revisions - clarify reachability examples
For the r1..r2 case, the exclusion of r1, rather than inclusion of r2, would be the unexpected case in natural language for a simple linear development, i.e. start..end excludes start. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/revisions.txt11
1 files changed, 6 insertions, 5 deletions
diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt
index f223a1cc40..e8120c0a0a 100644
--- a/Documentation/revisions.txt
+++ b/Documentation/revisions.txt
@@ -253,7 +253,8 @@ Commit Exclusions
'{caret}<rev>' (caret) Notation::
To exclude commits reachable from a commit, a prefix '{caret}'
notation is used. E.g. '{caret}r1 r2' means commits reachable
- from 'r2' but exclude the ones reachable from 'r1'.
+ from 'r2' but exclude the ones reachable from 'r1' (i.e. 'r1' and
+ its ancestors).
Dotted Range Notations
~~~~~~~~~~~~~~~~~~~~~~
@@ -297,12 +298,12 @@ Revision Range Summary
----------------------
'<rev>'::
- Include commits that are reachable from (i.e. ancestors of)
- <rev>.
+ Include commits that are reachable from <rev> (i.e. <rev> and its
+ ancestors).
'{caret}<rev>'::
- Exclude commits that are reachable from (i.e. ancestors of)
- <rev>.
+ Exclude commits that are reachable from <rev> (i.e. <rev> and its
+ ancestors).
'<rev1>..<rev2>'::
Include commits that are reachable from <rev2> but exclude