diff options
| author |  Alex Henrie <alexhenrie24@gmail.com> | 2020-09-24 21:50:23 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-09-24 23:04:27 -0700 |
| commit | 54200cef86a67ea6666d02be7f21e66d471624bf (patch) | |
| tree | b4565117720655c023e7d4fb49a2525dc7baa61d /builtin/merge-index.c | |
| parent | Git 2.27 (diff) | |
| download | tgif-54200cef86a67ea6666d02be7f21e66d471624bf.tar.xz | |
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>
Diffstat (limited to 'builtin/merge-index.c')
0 files changed, 0 insertions, 0 deletions