summaryrefslogtreecommitdiff
path: root/advice.h
diff options
context:
space:
mode:
authorPaul Tan <pyokagan@gmail.com>2015-06-18 10:54:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-06-18 20:17:09 (GMT)
commita9de98975479ef7d42986db63c16251c1f87ebcb (patch)
tree15e0a8879ec52ae65b75734b1eb9022a8a4deae1 /advice.h
parent44c175c7a46b3a0446e046bdaa566adb9e57d89d (diff)
downloadgit-a9de98975479ef7d42986db63c16251c1f87ebcb.zip
git-a9de98975479ef7d42986db63c16251c1f87ebcb.tar.gz
git-a9de98975479ef7d42986db63c16251c1f87ebcb.tar.bz2
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 'advice.h')
0 files changed, 0 insertions, 0 deletions