summaryrefslogtreecommitdiff
path: root/unpack-objects.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-09-29 21:01:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-09-29 21:01:22 (GMT)
commit299deeac8a67ef80989b86a75b012be1d2193bf9 (patch)
treecfc3ad84c4c300498b6aaf65cfb40ac823496d69 /unpack-objects.c
parentac4089da7bcf63698c239a16076a144e66de96a9 (diff)
parent54200cef86a67ea6666d02be7f21e66d471624bf (diff)
downloadgit-299deeac8a67ef80989b86a75b012be1d2193bf9.zip
git-299deeac8a67ef80989b86a75b012be1d2193bf9.tar.gz
git-299deeac8a67ef80989b86a75b012be1d2193bf9.tar.bz2
Merge branch 'ah/pull'
Earlier we taught "git pull" to warn when the user does not say the histories need to be merged, rebased or accepts only fast- forwarding, but the warning triggered for those who have set the pull.ff configuration variable. * ah/pull: pull: don't warn if pull.ff has been set
Diffstat (limited to 'unpack-objects.c')
0 files changed, 0 insertions, 0 deletions