merge: add a --autostash option

[agrn]

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.

[Denton-L]

RFC here: https://public-inbox.org/git/[email protected]/T/#t

[Denton-L]

Merged in bf10200.