diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-01-07 10:33:44 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-01-07 10:33:44 +0300 |
commit | d3fa84d52873cdf3852e41b684ab93475fe4424f (patch) | |
tree | 6f6fe8873da9513213974f837232993513ae4193 /commit.h | |
parent | 85cf82ff01ed975c31b75540afb1b251da5259fd (diff) | |
parent | c525de335e4a3919d49a9126b76d1288f35737be (diff) |
Merge branch 'fc/pull-merge-rebase'
When a user does not tell "git pull" to use rebase or merge, the
command gives a loud message telling a user to choose between
rebase or merge but creates a merge anyway, forcing users who would
want to rebase to redo the operation. Fix an early part of this
problem by tightening the condition to give the message---there is
no reason to stop or force the user to choose between rebase or
merge if the history fast-forwards.
* fc/pull-merge-rebase:
pull: display default warning only when non-ff
pull: correct condition to trigger non-ff advice
pull: get rid of unnecessary global variable
pull: give the advice for choosing rebase/merge much later
pull: refactor fast-forward check
Diffstat (limited to 'commit.h')
0 files changed, 0 insertions, 0 deletions