summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-09-26 23:09:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-09-26 23:09:17 (GMT)
commit2a1f3fe6e3c3e21b97dc4fa488bee859289e32fd (patch)
treec816aab2ad7030e4aa6f89c2a07680ae82d04b8b
parentb7af6ae5cff8439fdf5b72f926cab2e614906af3 (diff)
parent92dece7024fc0152c6de41a65cfb0df469c747e5 (diff)
downloadgit-2a1f3fe6e3c3e21b97dc4fa488bee859289e32fd.zip
git-2a1f3fe6e3c3e21b97dc4fa488bee859289e32fd.tar.gz
git-2a1f3fe6e3c3e21b97dc4fa488bee859289e32fd.tar.bz2
Merge branch 'ep/doc-check-ref-format-example'
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.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-check-ref-format.txt b/Documentation/git-check-ref-format.txt
index 91a3622..8611a99 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