Simply the best solution so far (make fast-forwarding off by –no-ff): git pull –no-ff Thanks to Dheeraj Kumar Rao for this useful answer.