Git merge only fastforward