X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-rev-parse.txt;h=627cde8520830c76378ffff0f2cc5cdc92fe2483;hb=4514ad4fb77b3c68f69133c22b9c0d3b88ff058f;hp=df308c3f5fa14c6fe0a9b7b5725ab49471eb8c74;hpb=d556fae2c0ea063f15ea4c3678fe931cc426f1ca;p=git.git diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt index df308c3f..627cde85 100644 --- a/Documentation/git-rev-parse.txt +++ b/Documentation/git-rev-parse.txt @@ -13,7 +13,7 @@ SYNOPSIS DESCRIPTION ----------- -Many git Porcelainish commands take mixture of flags +Many git porcelainish commands take mixture of flags (i.e. parameters that begin with a dash '-') and parameters meant for underlying `git-rev-list` command they use internally and flags and parameters for other commands they use as the @@ -91,7 +91,7 @@ OPTIONS --short, --short=number:: Instead of outputting the full SHA1 values of object names try to - abbriviate them to a shorter unique name. When no length is specified + abbreviate them to a shorter unique name. When no length is specified 7 is used. The minimum length is 4. --since=datestring, --after=datestring:: @@ -124,11 +124,12 @@ syntax. happen to have both heads/master and tags/master, you can explicitly say 'heads/master' to tell git which one you mean. -* A suffix '@' followed by a date specification such as 'yesterday' - (24 hours ago) or '1 month 2 weeks 3 days 1 hour 1 second ago' - to specify the value of the ref at a prior point in time. - This suffix may only be used immediately following a ref name - and the ref must have an existing log ($GIT_DIR/logs/). +* A suffix '@' followed by a date specification enclosed in a brace + pair (e.g. '\{yesterday\}', '\{1 month 2 weeks 3 days 1 hour 1 + second ago\}' or '\{1979-02-26 18:30:00\}') to specify the value + of the ref at a prior point in time. This suffix may only be + used immediately following a ref name and the ref must have an + existing log ($GIT_DIR/logs/). * A suffix '{caret}' to a revision parameter means the first parent of that commit object. '{caret}' means the th parent (i.e.