| commit | 54200cef86a67ea6666d02be7f21e66d471624bf | |
| author | Alex Henrie <alexhenrie24@gmail.com> | |
| Fri, 25 Sep 2020 03:50:23 +0000 (24 21:50 -0600) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 25 Sep 2020 06:04:27 +0000 (24 23:04 -0700) | ||
| tree | b4565117720655c023e7d4fb49a2525dc7baa61d | treesnapshot (tar.gz zip) |
| parent | b3d7a52fac39193503a0b6728771d1bf6a161464 | commitdiff |
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 <alexhenrie24@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
A user who understands enough to set pull.ff does not need additional
instructions.
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/pull.c | diffblobblamehistory | |
| t/t7601-merge-pull-config.sh | diffblobblamehistory |