summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-06-12 19:22:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-06-12 19:22:38 (GMT)
commit75cc6c67e25656c1b19c7c8f6ca29d1463aefef4 (patch)
treeb7515ad7e763f6e05757eeafbbca086129187a7a
parent50f84e34a1b0bb893327043cb0c491e02ced9ff5 (diff)
parent9a597edc831038b8c449bd3e527ca2976e4e55a6 (diff)
downloadgit-75cc6c67e25656c1b19c7c8f6ca29d1463aefef4.zip
git-75cc6c67e25656c1b19c7c8f6ca29d1463aefef4.tar.gz
git-75cc6c67e25656c1b19c7c8f6ca29d1463aefef4.tar.bz2
Sync with maint
* maint: pull: do not abuse 'break' inside a shell 'case'
-rwxr-xr-xgit-pull.sh2
1 files changed, 0 insertions, 2 deletions
diff --git a/git-pull.sh b/git-pull.sh
index cfc589d..18a394f 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -58,11 +58,9 @@ pull_ff=$(git config pull.ff)
case "$pull_ff" in
false)
no_ff=--no-ff
- break
;;
only)
ff_only=--ff-only
- break
;;
esac