summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-10-25 15:34:21 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-10-25 15:34:21 -0700
commit1c92a08f286453bd28a1f6153249b2e2cf63cb38 (patch)
tree48715f44d9ee2064f62f4a9b4759543caf7d00f4
parentgrep: do not segfault when -f is used (diff)
parentDocumentation: describe check-ref-format --branch (diff)
downloadtgif-1c92a08f286453bd28a1f6153249b2e2cf63cb38.tar.xz
Merge branch 'jn/maint-1.6.3-check-ref-format-doc' into maint-1.6.4
* 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
-------