X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-rev-parse.txt;h=3ccef2f2b3295c6d5e14b8f3a9d354d7b57598da;hb=fad5c96756fe9524fcb4e6ab7468368c2fb20fa0;hp=2921da320d2b84df4d15ec2745e6d94093dd6907;hpb=f44bc33c7283c19a86797ffdaafd22a19bbdfbd6;p=git.git diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt index 2921da320..3ccef2f2b 100644 --- a/Documentation/git-rev-parse.txt +++ b/Documentation/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 '@\{-\}' means the th branch checked out + before the current one. + * A suffix '{caret}' to a revision parameter means the first parent of that commit object. '{caret}' means the th parent (i.e. 'rev{caret}'