diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-09-29 16:49:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-29 16:49:43 -0700 |
| commit | 710658413712fd4c4abe539d4788aa954a36734a (patch) | |
| tree | 715bf63337125d2bbcd90ac8e5b22673ae5bf672 | |
| parent | a74a3b7a0bac24f7d05bf94d9449e9f1c2d32d18 (diff) | |
| parent | 92dece7024fc0152c6de41a65cfb0df469c747e5 (diff) | |
| download | git-710658413712fd4c4abe539d4788aa954a36734a.tar.gz | |
Merge branch 'ep/doc-check-ref-format-example' into maint
A shell script example in check-ref-format documentation has been
fixed.
* ep/doc-check-ref-format-example:
git-check-ref-format.txt: fixup documentation
| -rw-r--r-- | Documentation/git-check-ref-format.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-check-ref-format.txt b/Documentation/git-check-ref-format.txt index 91a3622ee4..8611a99120 100644 --- a/Documentation/git-check-ref-format.txt +++ b/Documentation/git-check-ref-format.txt @@ -118,8 +118,8 @@ $ git check-ref-format --branch @{-1} * Determine the reference name to use for a new branch: + ------------ -$ ref=$(git check-ref-format --normalize "refs/heads/$newbranch") || -die "we do not like '$newbranch' as a branch name." +$ ref=$(git check-ref-format --normalize "refs/heads/$newbranch")|| +{ echo "we do not like '$newbranch' as a branch name." >&2 ; exit 1 ; } ------------ GIT |