projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 44c175c) | patch
pull: support pull.ff config
authorPaul Tan <pyokagan@gmail.com>
Thu, 18 Jun 2015 10:54:03 +0000 (18:54 +0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 18 Jun 2015 20:17:09 +0000 (13:17 -0700)
commita9de98975479ef7d42986db63c16251c1f87ebcb
tree15e0a8879ec52ae65b75734b1eb9022a8a4deae1tree | snapshot
parent44c175c7a46b3a0446e046bdaa566adb9e57d89dcommit | diff
pull: support pull.ff config

Since b814da8 (pull: add pull.ff configuration, 2014-01-15), git-pull.sh
would lookup the configuration value of "pull.ff", and set the flag
"--ff" if its value is "true", "--no-ff" if its value is "false" and
"--ff-only" if its value is "only".

Re-implement this behavior.

Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/pull.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.