+7

Rebase: support autostashing working tree changes

Gxost 3 years ago updated by Marc Strapetz 4 weeks ago 2

Rebase ("Rebase HEAD to", "Rebase Interactive From") fails because of not stashed changes. It would be great to autostash/unstash files as for Pull-rebase feature.

Smartgit ease a lot developpers work with the auto stash feature, I really miss it A LOT when using interactive rebase... and I'm using it more and more often (specially when working in the log view)

+1

You can configure "rebase.autostash":

https://git-scm.com/docs/git-rebase#Documentation/git-rebase.txt-rebaseautoStash

It works even better than SmartGit's own auto-stashing because it will be able to apply the stash even if rebase had been stopped and continued due to conflicts.