git-rebase has a --autostash option to save unstaged changes before performing a rebase, and to restore them afterwards. Perhaps it could be interesting to add the same option to git-merge. Perhaps git-stash could be libified before we get down to this?
This was brought up in a discussion with a coworker of mine, where we talked about rebase --autostash, and I naïvely said “well, merge should have it too.” I was kind of surprised to see I was wrong on that.
git-rebasehas a--autostashoption to save unstaged changes before performing a rebase, and to restore them afterwards. Perhaps it could be interesting to add the same option togit-merge. Perhapsgit-stashcould be libified before we get down to this?This was brought up in a discussion with a coworker of mine, where we talked about
rebase --autostash, and I naïvely said “well, merge should have it too.” I was kind of surprised to see I was wrong on that.