diff options
| author |  Paul Tan <pyokagan@gmail.com> | 2015-06-18 18:54:03 +0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-06-18 13:17:09 -0700 |
| commit | a9de98975479ef7d42986db63c16251c1f87ebcb (patch) | |
| tree | 15e0a8879ec52ae65b75734b1eb9022a8a4deae1 /list-objects.c | |
| parent | pull: error on no merge candidates (diff) | |
| download | tgif-a9de98975479ef7d42986db63c16251c1f87ebcb.tar.xz | |
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>
Diffstat (limited to 'list-objects.c')
0 files changed, 0 insertions, 0 deletions