WARNING: git-filter-branch has a glut of gotchas generating mangled history
rewrites. Hit Ctrl-C before proceeding to abort, then use an
alternative filtering tool such as 'git filter-repo'(https://github.com/newren/git-filter-repo/) instead. See the
filter-branch manual page for more details; to squelch this warning,
set FILTER_BRANCH_SQUELCH_WARNING=1.
% git checkout branch
Switched to branch 'branch'
作業...
% git checkout master
Switched to branch 'master'
Your branch is ahead of 'origin/master' by 1 commit.
(use "git push" to publish your local commits)
作業が終わりmasterブランチに戻ってきました。
% git stash list
stash@{0}: WIP on master: 6c22e4e add directory
保存がしっかり確認できます。これから、戻していきます。
apply（保存を残す）
% git stash apply stash@{0}
On branch master
Your branch is ahead of 'origin/master' by 1 commit.
(use "git push" to publish your local commits)
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: index.html
no changes added to commit (use "git add" and/or "git commit -a")
これで無事masterでの作業に戻れました。ちなみに、
% git stash list
stash@{0}: WIP on master: 6c22e4e add directory
stash applyはlistに残ります。
pop（保存を残さない）
% git stash pop stash@{0}
Your branch is ahead of 'origin/master' by 1 commit.
(use "git push" to publish your local commits)
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: index.html
no changes added to commit (use "git add" and/or "git commit -a")
Dropped stash@{0} (732983fc2774b21734c7ee64d1d463f42ac6a41f)
% git stash list
