diff options
| author | Malfurious <m@lfurio.us> | 2021-03-24 03:18:22 -0400 |
|---|---|---|
| committer | Malfurious <m@lfurio.us> | 2021-03-24 03:18:22 -0400 |
| commit | 82c412c58081aa57197c2270bb544d790f35ffae (patch) | |
| tree | 9d6fcceb86f6918cf8c9dac24e911af860a7c651 /Makefile | |
| parent | a9737ee899dcfee46d8765c1b534b8c9df68cbe6 (diff) | |
| download | git-sonar-82c412c58081aa57197c2270bb544d790f35ffae.tar.gz git-sonar-82c412c58081aa57197c2270bb544d790f35ffae.zip | |
Fix issue with test-colors 'git pull' commands
If the user's git is configured with 'pull.ff = only', these lines would
fail since the two repositories have diverged from each other. '--ff'
is added to restore the original default of allowing either a
fast-forward or recursive merge to take place. In reality, an implicit
3-way merge is being performed. All tests now pass.
Signed-off-by: Malfurious <m@lfurio.us>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions