diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-04-19 21:37:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-04-19 21:37:25 -0700 |
| commit | 5feb8b8429b405e72b5786036774c9ffb20b64d9 (patch) | |
| tree | 3093c950ea87e0b1d345878539473e13460e6f90 /Documentation | |
| parent | Merge branch 'sf/putty-w-args' (diff) | |
| parent | doc/revisions: remove brackets from rev^-n shorthand (diff) | |
| download | tgif-5feb8b8429b405e72b5786036774c9ffb20b64d9.tar.xz | |
Merge branch 'vn/revision-shorthand-for-side-branch-log'
Doc cleanup.
* vn/revision-shorthand-for-side-branch-log:
doc/revisions: remove brackets from rev^-n shorthand
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/revisions.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt index 75d211f1a8..61277469c8 100644 --- a/Documentation/revisions.txt +++ b/Documentation/revisions.txt @@ -295,7 +295,7 @@ The 'r1{caret}@' notation means all parents of 'r1'. The 'r1{caret}!' notation includes commit 'r1' but excludes all of its parents. By itself, this notation denotes the single commit 'r1'. -The '<rev>{caret}-{<n>}' notation includes '<rev>' but excludes the <n>th +The '<rev>{caret}-<n>' notation includes '<rev>' but excludes the <n>th parent (i.e. a shorthand for '<rev>{caret}<n>..<rev>'), with '<n>' = 1 if not given. This is typically useful for merge commits where you can just pass '<commit>{caret}-' to get all the commits in the branch @@ -337,7 +337,7 @@ Revision Range Summary as giving commit '<rev>' and then all its parents prefixed with '{caret}' to exclude them (and their ancestors). -'<rev>{caret}-{<n>}', e.g. 'HEAD{caret}-, HEAD{caret}-2':: +'<rev>{caret}-<n>', e.g. 'HEAD{caret}-, HEAD{caret}-2':: Equivalent to '<rev>{caret}<n>..<rev>', with '<n>' = 1 if not given. |