diff options
| author | Elijah Newren <newren@gmail.com> | 2021-07-22 05:04:47 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-07-22 18:54:29 (GMT) |
| commit | adc27d6a9374d012b091bc348c20f5bfdbee52d1 (patch) | |
| tree | ab53d1e016d9d40cb68ff97227c446addb670044 /apply.c | |
| parent | e4dc25ed49d94c93b1d3f63efe17f32ca682cab7 (diff) | |
| download | git-adc27d6a9374d012b091bc348c20f5bfdbee52d1.zip git-adc27d6a9374d012b091bc348c20f5bfdbee52d1.tar.gz git-adc27d6a9374d012b091bc348c20f5bfdbee52d1.tar.bz2 | |
pull: make --rebase and --no-rebase override pull.ff=only
Fix the last few precedence tests failing in t7601 by now implementing
the logic to have --[no-]rebase override a pull.ff=only config setting.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'apply.c')
0 files changed, 0 insertions, 0 deletions