So a quick question: How do I undo/abort a merge? I am learning, and experimenting. I was experimenting with "git merge", forgot the "--no-commit", and discovered the hard way that aborting the editor that comes up without saving does NOT abort the merge.
And git merge --abort fails, because the merge succeeded. Git Gui has a way to amend the comment of the last merge, but no way to undo it. I figure this should be simple, but I don't know how. === How do I say "save all changes in my working directory to a temporary branch"? "git stash", I discovered, does NOT -- at least, not without some additional options and I'm not sure what those should be. --- Entertaining minecraft videos http://YouTube.com/keybounce -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
