Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
fsck: introduce identifiers for fsck messages
[gitweb.git]
/
git-pull.sh
diff --git
a/git-pull.sh
b/git-pull.sh
index b8ae0059208f654a888e3a98ce27fc97c422a2af..0917d0d056573912df60afd7b556efe04eeebae8 100755
(executable)
--- a/
git-pull.sh
+++ b/
git-pull.sh
@@
-54,8
+54,11
@@
then
fi
# Setup default fast-forward options via `pull.ff`
-pull_ff=$(
git
config pull.ff)
+pull_ff=$(
bool_or_string_
config pull.ff)
case "$pull_ff" in
+true)
+ no_ff=--ff
+ ;;
false)
no_ff=--no-ff
;;