Junio C Hamano schrieb: > Johannes Sixt <j.sixt@xxxxxxxxxxxxx> writes: >> Junio C Hamano schrieb: >> (2) The intended use-case of --merge-safe is to point the branch head to a >> different commit, but to carry the changes that currently are in the index >> and wd over to the new commit, similar to checkout --merge. This is actually an operation that I need quite often, but I can do it only by way of git stash. Clarification: I did not say that I actually meant to carry *only* the index and wd changes to the new commit. That is, the operation I have in mind can roughly be done in terms of $ git stash $ git reset --hard $target $ git stash pop > I have _no_ idea what the intended use-case of --merge-safe is, and that > was why I asked Christian for clarification in the previous round. The > answer was still not clear enough so I pointed out --merge-safe could be > still doing a wrong thing even in _his_ use-case. Reading Christian in 200909170554.49416.chriscool@xxxxxxxxxxxxx, I think this *is* his use-case? Christian? -- Hannes -- 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