diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-06-11 13:31:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-11 13:31:23 -0700 |
| commit | bb1c8fbcc86b31a1e86a1f6cadcb82d67fab1dc0 (patch) | |
| tree | 6f68b3eab895b3b5af84a47925f910d0c8b26a99 /Documentation | |
| parent | 96d339f1e345e4457c4409f29a84d13254489621 (diff) | |
| parent | 1f27e7d56b65fdc232a5a2a4de2ee97ff5eb176b (diff) | |
| download | git-bb1c8fbcc86b31a1e86a1f6cadcb82d67fab1dc0.tar.gz | |
Merge branch 'fc/at-head'
Instead of typing four capital letters "HEAD", you can say "@"
instead.
* fc/at-head:
sha1_name: compare variable with constant, not constant with variable
Add new @ shortcut for HEAD
sha1_name: refactor reinterpret()
sha1_name: check @{-N} errors sooner
sha1_name: reorganize get_sha1_basic()
sha1_name: don't waste cycles in the @-parsing loop
sha1_name: remove unnecessary braces
sha1_name: remove no-op
tests: at-combinations: @{N} versus HEAD@{N}
tests: at-combinations: increase coverage
tests: at-combinations: improve nonsense()
tests: at-combinations: check ref names directly
tests: at-combinations: simplify setup
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 |