| commit | a9de98975479ef7d42986db63c16251c1f87ebcb | |
| author | Paul Tan <pyokagan@gmail.com> | |
| Thu, 18 Jun 2015 10:54:03 +0000 (18 18:54 +0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 18 Jun 2015 20:17:09 +0000 (18 13:17 -0700) | ||
| tree | 15e0a8879ec52ae65b75734b1eb9022a8a4deae1 | treesnapshot (tar.gz zip) |
| parent | 44c175c7a46b3a0446e046bdaa566adb9e57d89d | commitdiff |
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>
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 | diffblobblamehistory |