Commit 69732e5a authored by Brad King's avatar Brad King
Browse files

Merge branch 'upstream-GitSetup' into update-gitsetup

* upstream-GitSetup:
  GitSetup 2017-12-01 (91813607)
parents eaf936c1 e37debfa
......@@ -64,7 +64,7 @@ test -n "$remote" || remote="gitlab"
# Identify and validate the topic branch name.
head="$(git symbolic-ref HEAD)" && topic="${head#refs/heads/}" || topic=''
if test -z "$topic" -o "$topic" = "master"; then
die 'You cant sync the master branch, please checkout the correct a branch with:
die 'You cannot sync the master branch. Please checkout the correct branch with:
git checkout <branch>'
fi
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment