git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b3d7a52)
pull: don't warn if pull.ff has been set
authorAlex Henrie <redacted>
Fri, 25 Sep 2020 03:50:23 +0000 (21:50 -0600)
committerJunio C Hamano <redacted>
Fri, 25 Sep 2020 06:04:27 +0000 (23:04 -0700)
commit54200cef86a67ea6666d02be7f21e66d471624bf
treeb4565117720655c023e7d4fb49a2525dc7baa61dtree | snapshot
parentb3d7a52fac39193503a0b6728771d1bf6a161464commit | diff
pull: don't warn if pull.ff has been set

A user who understands enough to set pull.ff does not need additional
instructions.

Signed-off-by: Alex Henrie <redacted>
Signed-off-by: Junio C Hamano <redacted>
builtin/pull.c diff | blob | history
t/t7601-merge-pull-config.sh diff | blob | history
git clone https://git.99rst.org/PROJECT