git: prevent merge commits with automatic rebase