diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2013-09-02 01:34:30 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-12 14:39:34 -0700 |
| commit | 9ba89f484e023827eca6ad44baf69af37dac4db3 (patch) | |
| tree | 412e36de2f9e033c1705bed8d21ed7aac3ad379f /Documentation | |
| parent | cf99a761d3903dbaf8265f60da9eaee6a15a6fe6 (diff) | |
| download | git-9ba89f484e023827eca6ad44baf69af37dac4db3.tar.gz | |
Add new @ shortcut for HEADfc/at-head
Typing 'HEAD' is tedious, especially when we can use '@' instead.
The reason for choosing '@' is that it follows naturally from the
ref@op syntax (e.g. HEAD@{u}), except we have no ref, and no
operation, and when we don't have those, it makes sens to assume
'HEAD'.
So now we can use 'git show @~1', and all that goody goodness.
Until now '@' was a valid name, but it conflicts with this idea, so
let's make it invalid. Probably very few people, if any, used this name.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-check-ref-format.txt | 2 | ||||
| -rw-r--r-- | Documentation/revisions.txt | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/git-check-ref-format.txt b/Documentation/git-check-ref-format.txt index a49be1bab4..fc02959ba4 100644 --- a/Documentation/git-check-ref-format.txt +++ b/Documentation/git-check-ref-format.txt @@ -54,6 +54,8 @@ Git imposes the following rules on how references are named: . They cannot contain a sequence `@{`. +. They cannot be the single character `@`. + . They cannot contain a `\`. These rules make it easy for shell script based tools to parse diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt index d477b3f6bc..09896a37b1 100644 --- a/Documentation/revisions.txt +++ b/Documentation/revisions.txt @@ -58,6 +58,9 @@ the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file. While the ref name encoding is unspecified, UTF-8 is preferred as some output processing may assume ref names in UTF-8. +'@':: + '@' alone is a shortcut for 'HEAD'. + '<refname>@\{<date>\}', e.g. 'master@\{yesterday\}', 'HEAD@\{5 minutes ago\}':: A ref followed by the suffix '@' with a date specification enclosed in a brace |