aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorShawn Pearce <spearce@spearce.org>2006-05-19 03:29:43 -0400
committerJunio C Hamano <junkio@cox.net>2006-05-19 15:02:55 -0700
commitcce91a2caef9296bd4a69e51e48f1d679935d868 (patch)
treef07d98e7d05398013e29bc35a95693489a5a77c2 /Documentation
parentd0740d92beb019a7b02678e5acea79c0ff67e3ee (diff)
downloadgit-cce91a2caef9296bd4a69e51e48f1d679935d868.tar.gz
git-cce91a2caef9296bd4a69e51e48f1d679935d868.tar.xz
Change 'master@noon' syntax to 'master@{noon}'.
Its ambiguous to parse "master@2006-05-17 18:30:foo" when foo is meant as a file name and ":30" is meant as 30 minutes past 6 pm. Therefore all date specifications in a sha1 expression must now appear within brackets and the ':' splitter used for the path name in a sha1 expression ignores ':' appearing within brackets. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-rev-parse.txt11
1 files changed, 6 insertions, 5 deletions
diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt
index df308c3f5..b89469436 100644
--- a/Documentation/git-rev-parse.txt
+++ b/Documentation/git-rev-parse.txt
@@ -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/<ref>).
+* 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/<ref>).
* A suffix '{caret}' to a revision parameter means the first parent of
that commit object. '{caret}<n>' means the <n>th parent (i.e.