diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-06-12 12:22:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-12 12:22:38 -0700 |
| commit | 75cc6c67e25656c1b19c7c8f6ca29d1463aefef4 (patch) | |
| tree | b7515ad7e763f6e05757eeafbbca086129187a7a /git-pull.sh | |
| parent | 50f84e34a1b0bb893327043cb0c491e02ced9ff5 (diff) | |
| parent | 9a597edc831038b8c449bd3e527ca2976e4e55a6 (diff) | |
| download | git-75cc6c67e25656c1b19c7c8f6ca29d1463aefef4.tar.gz git-75cc6c67e25656c1b19c7c8f6ca29d1463aefef4.tar.xz | |
Sync with maint
* maint:
pull: do not abuse 'break' inside a shell 'case'
Diffstat (limited to 'git-pull.sh')
| -rwxr-xr-x | git-pull.sh | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/git-pull.sh b/git-pull.sh index cfc589dc1..18a394fcc 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 |