On Jul 30, 2007, at 8:48 AM, Junio C Hamano wrote:
I tend to agree that it would make sense to allow something like: $ git merge --no-fast-forward -m 'Merge topic XYZ' xyz
Another option could be to force a commit before the merge, even if there are no changes to commit, something like $ git commit --force -m 'MARK' [to my knowledge, --force or similar is not yet available] Steffen - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html