From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 20 Apr 2017 04:37:25 +0000 (-0700)
Subject: Merge branch 'vn/revision-shorthand-for-side-branch-log'
X-Git-Tag: v2.13.0-rc0~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5feb8b8429b405e72b5786036774c9ffb20b64d9?hp=-c

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
---

5feb8b8429b405e72b5786036774c9ffb20b64d9
diff --combined Documentation/revisions.txt
index 75d211f1a8,c53621981c..61277469c8
--- a/Documentation/revisions.txt
+++ b/Documentation/revisions.txt
@@@ -96,8 -96,7 +96,8 @@@ some output processing may assume ref n
    refers to the branch that the branch specified by branchname is set to build on
    top of (configured with `branch.<name>.remote` and
    `branch.<name>.merge`).  A missing branchname defaults to the
 -  current one.
 +  current one. These suffixes are also accepted when spelled in uppercase, and
 +  they mean the same thing no matter the case.
  
  '<branchname>@\{push\}', e.g. 'master@\{push\}', '@\{push\}'::
    The suffix '@\{push}' reports the branch "where we would push to" if
@@@ -123,9 -122,6 +123,9 @@@ refs/remotes/myfork/mybranc
  Note in the example that we set up a triangular workflow, where we pull
  from one location and push to another. In a non-triangular workflow,
  '@\{push}' is the same as '@\{upstream}', and there is no need for it.
 ++
 +This suffix is also accepted when spelled in uppercase, and means the same
 +thing no matter the case.
  
  '<rev>{caret}', e.g. 'HEAD{caret}, v1.5.1{caret}0'::
    A suffix '{caret}' to a revision parameter means the first parent of
@@@ -295,7 -291,7 +295,7 @@@ The 'r1{caret}@' notation means all par
  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 -333,7 +337,7 @@@ Revision Range Summar
    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.