On Thu, Nov 11, 2010 at 11:50 AM, Jonathan Nieder <jrnieder@xxxxxxxxx> wrote: > Couldn't > > $ git merge --no-commit svn_to_git_wip > $ git reset > > have worked? Hi Jonathan, Thanks. That's where I started (although I also added the --no-ff flag to the git-merge command) , but then I decided to get fancy and switched to the svn_to_git_wip branch and rebase it on master first. In hindsight, I was trying to be to clever for my own good. But I figured I could always undo any mistakes. I was just surprised to find that my work-in-progress had disappeared despite the fact that I hadn't done a commit. (It's possible/likely that I did an implicit commit when I was playing with rebase.) Anyway, next time I'll use git-stash, and in the future, I'll be much more paranoid about using git-reset. --wpd -- 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