On Thu, Dec 12, 2019 at 10:09:01AM -0800, Denton Liu wrote: > Hi rottis, > > On Thu, Dec 12, 2019 at 02:19:50PM +0200, rottis@xxxxxx wrote: > > Similar to the 'git rebase --autostash', running 'git checkout --autostash' would automatically stash uncommitted changes for the > > current branch. then running 'git branch --autopop' would automatically apply an automatic stash when switching to a branch that had one. > > I currently have a WIP version of this feature but I haven't had enough > time to polish it off (tests and docs). The last RFC round can be seen > here[1] if you want to test it out. It seems to work well enough for > personal use. Sorry, my mistake. I misread your message; my topic was for `git merge --autostash`. However, it does generalise the autostash machinery so perhaps it'll be simpler to implement it into checkout in the future, if that's desired?