diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2020-12-12 10:52:08 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-12-15 17:39:42 -0800 |
| commit | c525de335e4a3919d49a9126b76d1288f35737be (patch) | |
| tree | 7f27847036306c8ac80325a37680ce64219b54fd /commit.h | |
| parent | 7539fdc6290750c617c0b638c2f3b2f63c389ed3 (diff) | |
pull: display default warning only when non-ff
There's no need to display the annoying warning on every pull... only
the ones that are not fast-forward.
The current warning tests still pass, but not because of the arguments
or the configuration, but because they are all fast-forward.
We need to test non-fast-forward situations now.
Suggestions-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit.h')
0 files changed, 0 insertions, 0 deletions