Hi, On Thu, 15 Jan 2009, Anders Melchiorsen wrote: > Previously, the interactive rebase edit mode placed the user after the > commit in question. That was awkward because a commit is supposedly > immutable. Thus, she was forced to use "git commit --amend" for her > changes. Maybe, maybe not. I frequently rebase with "edit" when I actually mean "stop" (but "s" was taken from "squash" already). Then I test things, possibly fixing them. So in that case, I do not want a git reset --soft HEAD^. In any case, there is a pretty obvious difference between a merge conflict and a stop at "edit": the latter even shows you a pretty verbose explanation what to do next. I also have to admit that it escapes me why you would want to force a new commit if nothing was changed to begin with. However, I often would like to have "amend message" or some such, and I remember having seen patches, but I do not remember why they did not make it in. Ciao, Dscho -- 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
