git stash简介

原文：<wbr style="line-height:25px"><a rel="nofollow" href="http://gitbook.liuhui998.com/4_5.html" style="color:rgb(245,149,19); line-height:25px; text-decoration:none">http://gitbook.liuhui998.com/4_5.html</a> <div style="line-height:25px"> <div style="line-height:25px"><span style="line-height:25px">一、基本操作</span></div> <div style="line-height:25px"><span style="color:#000080; line-height:25px">当你正在做一项复杂的工作时, 发现了一个和当前工作不相关但是又很讨厌的bug. 你这时想先修复bug再做手头的工作, 那么就可以用 git stash 来保存当前的工作状态, 等你修复完bug后,执行'反储藏'(unstash)操作就可以回到之前的工作里.</span></div> <div style="line-height:25px"> <span style="color:#0000ff; line-height:25px">$</span><span style="color:#ff6600; line-height:25px">git</span><span style="color:#ff00ff; line-height:25px">stash</span><span style="color:#0000ff; line-height:25px"></span><span style="color:#ff6600; line-height:25px">save</span><span style="color:#0000ff; line-height:25px">"</span><span style="color:#808000; line-height:25px">work in progress for foo feature</span><span style="color:#0000ff; line-height:25px">"</span> </div> <div style="line-height:25px"><span style="color:#000080; line-height:25px">上面这条命令会保存你的本地修改到储藏(stash)中, 然后将你的工作目录和索引里的内容全部重置, 回到你当前所在分支的上次提交时的状态.</span></div> <div style="line-height:25px"><span style="line-height:25px; color:rgb(0,0,128)">好了, 你现在就可以开始你的修复工作了.</span></div> <div style="line-height:25px"><span style="color:#3366ff; line-height:25px">... edit and test ...</span></div> <div style="line-height:25px"><span style="color:#3366ff; line-height:25px">$ git commit -a -m "blorpl: typofix"</span></div> <div style="line-height:25px"><span style="color:#000080; line-height:25px">当你修复完bug后, 你可以用git stash apply来回复到以前的工作状态.</span></div> <div style="line-height:25px"> <span style="color:#0000ff; line-height:25px">$</span><span style="color:#ff6600; line-height:25px">git</span><span style="color:#0000ff; line-height:25px"></span><span style="color:#ff00ff; line-height:25px">stash</span><span style="color:#0000ff; line-height:25px"></span><span style="color:#ff9900; line-height:25px">apply</span> </div> <div style="line-height:25px"><span style="line-height:25px">二、储藏队列</span></div> <div style="line-height:25px"> <span style="line-height:25px; color:rgb(0,0,128)">你也可多次使用'</span><span style="color:#993300; line-height:25px">git stash</span><span style="color:#000080; line-height:25px">'</span><span style="line-height:25px; color:rgb(0,0,128)">命令,　每执行一次就会把针对当前修改的‘储藏’(stash)添加到储藏队列中.</span> </div> <div style="line-height:25px"> <span style="line-height:25px; color:rgb(0,0,128)">用'</span><span style="color:#ff6600; line-height:25px">git</span><span style="color:#ff00ff; line-height:25px">stash</span><span style="color:#ff9900; line-height:25px">list'</span><span style="line-height:25px; color:rgb(0,0,128)">命令可以查看你保存的'储藏'(stashes):</span> </div> <div style="line-height:25px"> <span style="color:#0000ff; line-height:25px">$&gt;</span><span style="color:#ff6600; line-height:25px">git</span><span style="color:#ff00ff; line-height:25px">stash</span><span style="color:#ff6600; line-height:25px"></span><span style="color:#ff9900; line-height:25px">list</span> </div> <div style="line-height:25px"><span style="color:#3366ff; line-height:25px">stash@{0}: WIP on book: 51bea1d... fixed images</span></div> <div style="line-height:25px"><span style="color:#3366ff; line-height:25px">stash@{1}: WIP on master: 9705ae6... changed the browse code to the official repo</span></div> <div style="line-height:25px"> <span style="color:#000080; line-height:25px">可以用类似'</span><span style="color:#ff6600; line-height:25px">git</span><span style="color:#ff00ff; line-height:25px">stash</span><span style="color:#ff6600; line-height:25px"></span><span style="color:#ff9900; line-height:25px">apply</span><span style="color:#808000; line-height:25px">stash@{1}</span><span style="color:#000080; line-height:25px">'的命令来使用在队列中的任意一个'储藏'(stashes).</span> </div> <div style="line-height:25px"> <span style="color:#000080; line-height:25px">'</span><span style="color:#ff00ff; line-height:25px">git stash clear</span><span style="color:#000080; line-height:25px">‘则</span>是用来清空这个队列.</div> </div> </wbr>