git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ac4089d 54200ce)
Merge branch 'ah/pull'
authorJunio C Hamano <redacted>
Tue, 29 Sep 2020 21:01:22 +0000 (14:01 -0700)
committerJunio C Hamano <redacted>
Tue, 29 Sep 2020 21:01:22 +0000 (14:01 -0700)
commit299deeac8a67ef80989b86a75b012be1d2193bf9
treecfc3ad84c4c300498b6aaf65cfb40ac823496d69tree | snapshot
parentac4089da7bcf63698c239a16076a144e66de96a9commit | diff
parent54200cef86a67ea6666d02be7f21e66d471624bfcommit | diff
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
builtin/pull.c diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT