summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-09-20 12:38:10 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-09-20 12:38:10 -0700
commitf406140baa5128bfa537c271c7292a866c08b7d4 (patch)
treec52ee64bfc197e86ee928f8e40056f46ab0f7be9 /Documentation
parentMerge branch 'dw/check-ignore-sans-index' (diff)
parentAdd new @ shortcut for HEAD (diff)
downloadtgif-f406140baa5128bfa537c271c7292a866c08b7d4.tar.xz
Merge branch 'fc/at-head'
Instead of typing four capital letters "HEAD", you can say "@" now, e.g. "git log @". * fc/at-head: Add new @ shortcut for HEAD sha1-name: pass len argument to interpret_branch_name()
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-check-ref-format.txt2
-rw-r--r--Documentation/revisions.txt3
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 71dcd12ebd..2c06ed34ad 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