merge with no ff and without commit by default in git