git merge 与 rebase, 还有stash概念

NoSuchKey