Merge branch 'jj/stash-reset-only-toplevel'