Sync with maint

* maint:
pull: do not abuse 'break' inside a shell 'case'

diff --combined git-pull.sh
index cfc589dc15061c8ed1797c2d91ec420b1d6f33fe,7358fac86433b61a35ad332d680ba9b4a9d300b2..18a394fcc4e704621c8b5e8bc92b7cbee2fd21fe
--- 1/git-pull.sh
--- 2/git-pull.sh
+++ b/git-pull.sh
@@@ -58,11 -58,9 +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
  
@@@ -108,7 -106,7 +106,7 @@@ d
        -s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy)
                case "$#,$1" in
                *,*=*)
 -                      strategy=`expr "z$1" : 'z-[^=]*=\(.*\)'` ;;
 +                      strategy=$(expr "z$1" : 'z-[^=]*=\(.*\)') ;;
                1,*)
                        usage ;;
                *)