summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-10-18 23:01:26 -0700
committerJunio C Hamano <gitster@pobox.com>2009-10-18 23:01:26 -0700
commitc22e5e994a12b1c986427e8bdba6d86899f1aa30 (patch)
treee28d8fb2d1429ef18f284724b2f982310fd4c8b4
parente38d1c555e56a9b19f69250f22d2965b621a04af (diff)
parent604e0cb5cbd2ea2e37273e13f99b6572cd82b4c1 (diff)
downloadgit-c22e5e994a12b1c986427e8bdba6d86899f1aa30.tar.gz
Merge branch 'jn/maint-1.6.3-check-ref-format-doc'
* jn/maint-1.6.3-check-ref-format-doc: Documentation: describe check-ref-format --branch
-rw-r--r--Documentation/git-check-ref-format.txt9
1 files changed, 6 insertions, 3 deletions
diff --git a/Documentation/git-check-ref-format.txt b/Documentation/git-check-ref-format.txt
index 0b7982ea76..e9b3b40af4 100644
--- a/Documentation/git-check-ref-format.txt
+++ b/Documentation/git-check-ref-format.txt
@@ -9,7 +9,7 @@ SYNOPSIS
--------
[verse]
'git check-ref-format' <refname>
-'git check-ref-format' [--branch] <branchname-shorthand>
+'git check-ref-format' --branch <branchname-shorthand>
DESCRIPTION
-----------
@@ -63,8 +63,11 @@ reference name expressions (see linkgit:git-rev-parse[1]):
. at-open-brace `@{` is used as a notation to access a reflog entry.
-With the `--branch` option, it expands a branch name shorthand and
-prints the name of the branch the shorthand refers to.
+With the `--branch` option, it expands the ``previous branch syntax''
+`@{-n}`. For example, `@{-1}` is a way to refer the last branch you
+were on. This option should be used by porcelains to accept this
+syntax anywhere a branch name is expected, so they can act as if you
+typed the branch name.
EXAMPLE
-------