diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-10-30 20:07:33 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-10-30 20:07:33 -0700 |
commit | 68d00fd83421a0494c66512e4c66829f4863693d (patch) | |
tree | 4f902d832bc56a06b870741f6b632f5cd7c9cde2 /Documentation | |
parent | Merge branch 'jc/maint-1.6.3-graft-trailing-space' (diff) | |
parent | check-ref-format: simplify --print implementation (diff) | |
download | tgif-68d00fd83421a0494c66512e4c66829f4863693d.tar.xz |
Merge branch 'jn/show-normalized-refs'
* jn/show-normalized-refs:
check-ref-format: simplify --print implementation
git check-ref-format --print
Add tests for git check-ref-format
Conflicts:
Documentation/git-check-ref-format.txt
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/git-check-ref-format.txt | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/Documentation/git-check-ref-format.txt b/Documentation/git-check-ref-format.txt index e9b3b40af4..0aeef24780 100644 --- a/Documentation/git-check-ref-format.txt +++ b/Documentation/git-check-ref-format.txt @@ -9,6 +9,7 @@ SYNOPSIS -------- [verse] 'git check-ref-format' <refname> +'git check-ref-format' --print <refname> 'git check-ref-format' --branch <branchname-shorthand> DESCRIPTION @@ -63,19 +64,31 @@ reference name expressions (see linkgit:git-rev-parse[1]): . at-open-brace `@{` is used as a notation to access a reflog entry. +With the `--print` option, if 'refname' is acceptable, it prints the +canonicalized name of a hypothetical reference with that name. That is, +it prints 'refname' with any extra `/` characters removed. + 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 -------- - -git check-ref-format --branch @{-1}:: - -Print the name of the previous branch. +EXAMPLES +-------- +* Print the name of the previous branch: ++ +------------ +$ git check-ref-format --branch @{-1} +------------ + +* Determine the reference name to use for a new branch: ++ +------------ +$ ref=$(git check-ref-format --print "refs/heads/$newbranch") || +die "we do not like '$newbranch' as a branch name." +------------ GIT --- |