Automatic stash when rebasing

[WizardUli]

Intellij IDEA automatically stashes changes when going into an interactive rebase and unstashes them afterwards. This could make a nice GitLens feature.

It should probably be configurable but I see no reason why not have it on by default when the interactive rebase UI is enabled. Right now every little rewording, every little fixup requires executing git stash or pushing the stash button first and then running git unstash (there is no unstash button AFAIK) at the end which is sooo tedious.

[AlexandreMarkus]

Would be also nice to have this feature when changing branch or pulling

[Onekki]

Add custom command for some operations should be better.

[Lorite]

Please add this as a setting. VS Code's git already allows us to do it :)

[xpader]

Intellij IDEA is the best git manager in the world.

[Blackhex]

It would be even better if this feature would play nice with git rerere, e.g., enable it by default and train the resolutions.

[CTimmerman]

Doesn't git config --global rebase.autoStash true already do that? Maybe leave out the global if the local project overrides it.

[Blackhex]

Doesn't git config --global rebase.autoStash true already do that? Maybe leave out the global if the local project overrides it.

Only partially. Don't know the details how auto stash is implemented in Intellij IDEA but it works much better automatically resolving some trivial collisions under the hood.