diff options
| author |  Elijah Newren <newren@gmail.com> | 2021-07-22 05:04:47 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-07-22 11:54:29 -0700 |
| commit | adc27d6a9374d012b091bc348c20f5bfdbee52d1 (patch) | |
| tree | ab53d1e016d9d40cb68ff97227c446addb670044 /t/lib-bitmap.sh | |
| parent | pull: since --ff-only overrides, handle it first (diff) | |
| download | tgif-adc27d6a9374d012b091bc348c20f5bfdbee52d1.tar.xz | |
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 't/lib-bitmap.sh')
0 files changed, 0 insertions, 0 deletions