]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ac4089d 54200ce)
Merge branch 'ah/pull'
authorJunio C Hamano <gitster@pobox.com>
Tue, 29 Sep 2020 21:01:22 +0000 (14:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 29 Sep 2020 21:01:22 +0000 (14:01 -0700)
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

1  2 
builtin/pull.c patch | diff1 | diff2 | blob | history

diff --cc builtin/pull.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.