Jonathan Nieder wrote: > I wouldn't be surprised if there's still a documentation bug, though: > a lack of clarity, a missing hint somewhere else, something else > misleading. That seems especially likely when you say "I trusted the > documentation on this one". Care to point to the appropriate section, > so it can be fixed?
As I pointed out in a previous email, I'm referring to the --abort section of git-merge(1): "If there were uncommitted worktree changes present when the merge started, git merge --abort will in some cases be unable to reconstruct these changes. It is therefore recommended to always commit or stash your changes before running git merge." Matthieu (and probably others) run git merge with a dirty worktree most of the time, while I never do (because I read this section). -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html