X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-rev-parse.txt;h=3ccef2f2b3295c6d5e14b8f3a9d354d7b57598da;hb=bd9efbf35424c9436f62768e47f5819c9b5bcf9e;hp=088f971b790ddd11d39ab2c3b441833961e53a0f;hpb=bb293b831b9d0aade79c0acf5bf6091106e7d19b;p=git.git diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt index 088f971b7..3ccef2f2b 100644 --- a/Documentation/git-rev-parse.txt +++ b/Documentation/git-rev-parse.txt @@ -155,8 +155,9 @@ blobs contained in a commit. name the same commit object if there are no other object in your repository whose object name starts with dae86e. -* An output from 'git-describe'; i.e. a closest tag, followed by a - dash, a `g`, and an abbreviated object name. +* An output from 'git-describe'; i.e. a closest tag, optionally + followed by a dash and a number of commits, followed by a dash, a + `g`, and an abbreviated object name. * A symbolic ref name. E.g. 'master' typically means the commit object referenced by $GIT_DIR/refs/heads/master. If you @@ -211,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}' @@ -426,7 +430,7 @@ but if $REV is empty, the commit object name from master will be printed. Author ------ Written by Linus Torvalds . -Junio C Hamano and Pierre Habouzit +Junio C Hamano and Pierre Habouzit Documentation --------------