git merge --no-ff with check for missing rebase