Added back autosetupmerge to true
Automatically rebase on fetched branch when git pull