summaryrefslogtreecommitdiffstats
path: root/git-rev-parse.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2009-01-29 01:54:02 +0000
committerJunio C Hamano <junio@hera.kernel.org>2009-01-29 01:54:02 +0000
commit440791e6481312398e9f265fae88a443bda4e5c0 (patch)
treeeb9e7bebff80ff19a7f388517f755406923abe6a /git-rev-parse.txt
parenta07e81615021017ceca672ee38fc554bca031683 (diff)
downloadgit-htmldocs-440791e6481312398e9f265fae88a443bda4e5c0.tar.gz
Autogenerated HTML docs for v1.6.1.1-259-g8712
Diffstat (limited to 'git-rev-parse.txt')
-rw-r--r--git-rev-parse.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/git-rev-parse.txt b/git-rev-parse.txt
index 2921da320..3ccef2f2b 100644
--- a/git-rev-parse.txt
+++ b/git-rev-parse.txt
@@ -212,6 +212,9 @@ when you run 'git-merge'.
reflog of the current branch. For example, if you are on the
branch 'blabla', then '@\{1\}' means the same as 'blabla@\{1\}'.
+* The special construct '@\{-<n>\}' means the <n>th branch checked out
+ before the current one.
+
* A suffix '{caret}' to a revision parameter means the first parent of
that commit object. '{caret}<n>' means the <n>th parent (i.e.
'rev{caret}'