Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jx/blame-align-relative-time' into maint
[gitweb.git]
/
git-pull.sh
diff --git
a/git-pull.sh
b/git-pull.sh
index 6cd8ebc534c174dfe613f62047424dc7491d75fa..7358fac86433b61a35ad332d680ba9b4a9d300b2 100755
(executable)
--- 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