| commit | 278f4be806f93579c64cd9993fdad2eb589f86c6 | |
| author | Felipe Contreras <felipe.contreras@gmail.com> | |
| Sat, 12 Dec 2020 16:52:07 +0000 (12 10:52 -0600) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 14 Dec 2020 17:03:17 +0000 (14 09:03 -0800) | ||
| tree | 8bca30d506814e16d4892e8a51e2cf5ea51eca20 | treesnapshot (tar.gz zip) |
| parent | 77a7ec632952ee335cb544fee7c6b3fb1c5ec147 | commitdiff |
pull: give the advice for choosing rebase/merge much later
Eventually we want to be omit the advice when we can fast-forward
in which case there is no reason to require the user to choose
between rebase or merge.
In order to do so, we need to delay giving the advice up to the
point where we can check if we can fast-forward or not.
Additionally, config_get_rebase() was probably never its true home.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Eventually we want to be omit the advice when we can fast-forward
in which case there is no reason to require the user to choose
between rebase or merge.
In order to do so, we need to delay giving the advice up to the
point where we can check if we can fast-forward or not.
Additionally, config_get_rebase() was probably never its true home.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/pull.c | diffblobblamehistory |