<!-- .slide: data-transition="zoom" --> <div style="font-size:70%"> 沒遇到這些事之前，我也覺得我git超屌 Episode 2 === </div> --- <p style="text-align:right">By Ray</p> --- <!--  --> <img src="https://lh3.googleusercontent.com/9OJnL_MkWp_r8JI5qGGF-4YGIve9dR6XLDjyLmTatkfArBT5cYyY9zw29VNKxEMbXwaAE8L5FqI2y2R-212PprcNWIr2Iyp9RbjhPSuEjzyUOqu47_-fwTnu0XpoymsSVEiTwruu0-is27tyTAjG3muKn9PEzGXsNmdnd9U5JwGxPHMT5Zj_PfE9UMjjSD_K0BCuynhA3YKbiPsj_8FaClR9S8Jc9YIoeQkS3o17sO46PktAsWkJq1cbZM8Q6_n_WLJfhVW_bNdxRHq-d546CyJlbW8KW3oK8qFy6UiJ0J9rVuvmQqMUlWquUmnmFIsYMMZZ9KIwgxYb-5h1h4T0QX9heqUrGVIeqO_vNx5IE4LmWfkle1TxrnSBsbpl05SMZYev_UqnrM--SkLNF9-8VtFeYHwVqtCpiEzfyCzAgt1FAeXDBq0sdsxYZiCLThUOgzK7Mcx12pBK7U0vt6khYIGA3w6vcFqAnXJ0lhCJyCRNTGl0aiQYjGMYXe3Dx7Onru8YlRmJqNN4LlBXX3DJI2zZXEmwdScsAeuMjBGobSY3fkmLH-lJmyNbOH5Y3Wb8IEVJv2nyJ5pxpa_aIYVoXSfMlPyaibjcWOmMJX_Tx3SkqhlfdEs9uyP3onuy8tMRrkVikz3CLCHG5sCZZxBFIVAu_nHrvOA=w639-h1136-no" style="border: 0; background: transparent; width: 200px;"> ---- ## Ray Lee #### Backend Programmer [GitHub](https://github.com/tn710617) | [My Blog](https://tn710617.github.io/) --- <!-- .slide: data-transition="fade-in concave-out" --> #### 希望看完以下狀況解說之後，你還能對大聲地對自己說:”我會Git” ---- #### I hope that you will still be able to say loudly that you know Git after all those situations ---- <!-- .slide: data-transition="fade-in concave-out" --> #### <span style="color:red; font-weight:bold"><警告!></span> 本次分享大多數指令涉及修改歷史請小心服用 ---- #### <span style="color:red; font-weight:bold"><Warning!></span> The command shared here would largely revise the history ---- <!-- .slide: data-transition="fade-in concave-out" --> #### 我好像commit錯了，怎麼辦？ ---- #### It seems that I made a wrong commit, what could I do? ---- <!-- .slide: data-transition="fade-in concave-out" --> #### 那這個錯的commit，你 git push了嗎？ ---- #### Have you pushed it? ---- <!-- .slide: data-transition="fade-in concave-out" --> #### 好加在，還沒… ---- #### Thank god, not yet ---- <!-- .slide: data-transition="fade-in concave-out" --> #### 我只需要一些小修改 ---- #### Actually I only need some small revising. ---- <div style="text-align:center"> <ul style="list-style-type:square;list-style-position:outside"> <!-- .slide: data-transition="fade-in concave-out" data-background="#666666"--> <span><li>git commit<!-- .element: class="fragment" data-fragment-index="1" --></li></span> <span><li>--amend<!-- .element: class="fragment" data-fragment-index="2" --></li></span> </ul> </div> --- <!-- .slide: data-transition="fade-in concave-out" --> #### 我就是要全部重做，我就是爽 ---- #### I want to redo all of them. I am just happy with it. ---- <div style="text-align:center"> <ul style="list-style-type:square;list-style-position:outside"> <!-- .slide: data-transition="fade-in concave-out" data-background="#666666"--> <span><li>git reset<!-- .element: class="fragment" data-fragment-index="1" --></li></span> <span><li>@^<!-- .element: class="fragment" data-fragment-index="2" --></li></span> <span><li>--hard<!-- .element: class="fragment" data-fragment-index="5" --></li></span> </ul> </div> --- <!-- .slide: data-transition="fade-in concave-out" --> #### 可以回到過去，又不用放棄嗎？ ---- #### Can I just go back, but with everything unchanged? ---- <div style="text-align:center"> <ul style="list-style-type:square;list-style-position:outside"> <!-- .slide: data-transition="fade-in concave-out" data-background="#666666"--> <span><li>git reset<!-- .element: class="fragment" data-fragment-index="1" --></li></span> <span><li>@^<!-- .element: class="fragment" data-fragment-index="2" --></li></span> <span><li>--mixed or --soft<!-- .element: class="fragment" data-fragment-index="3" --></li></span> </ul> </div> --- <!-- .slide: data-transition="fade-in concave-out" --> #### 靠！手滑推上去了！ --- #### Shi.., I already pushed it... ---- <!-- .slide: data-transition="fade-in concave-out" --> #### 沒關係，還有救！ --- #### Don't worry, it's not going to be the end of the world. ---- #### 這些我都不要了！ --- #### I want nothing... ---- git revert commitID --- <!-- .slide: data-transition="fade-in concave-out" --> #### 我還可以修改嗎？ ---- #### Can I still make some change? ---- <!-- .slide: data-transition="fade-in concave-out" data-background="#1A237E"--> #### 當然可以，說清楚講明白就行！再多做一個commit來改正吧！ ---- #### Of course! Just make it crystal clear. Make one commit for correction. --- #### 可以回到過去，又回到現在，又回到過去，又回到現在...嗎？ ---- #### Can I just go back to the past, and back to the present, and back to the past, and back to the present...? ---- #### 開個玩笑而已，我只是要回到上一個步驟 ---- #### Just kidding.. I just want to go back to last move. ---- <div style="text-align:center"> <ul style="list-style-type:square;list-style-position:outside"> <!-- .slide: data-transition="fade-in concave-out" data-background="#666666"--> <span><li>git reset<!-- .element: class="fragment" data-fragment-index="1" --></li></span> <span><li>ORIG_HEAD<!-- .element: class="fragment" data-fragment-index="2" --></li></span> </ul> </div> ---- #### 沒有做不到，只有不敢想，想去哪裡就去哪裡！ ---- #### Only what you dare not think is impossible. Go wherever you wish. ---- <div style="text-align:center"> <ul style="list-style-type:square;list-style-position:outside"> <!-- .slide: data-transition="fade-in concave-out" data-background="#666666"--> <span><li>git reflog<!-- .element: class="fragment" data-fragment-index="1" --></li></span> <span><li>git reset SHA1s<!-- .element: class="fragment" data-fragment-index="2" --></li></span> <span><li>--hard<!-- .element: class="fragment" data-fragment-index="3" --></li></span> </ul> </div> --- <!-- .slide: data-transition="zoom" --> ## Q&A --- <!-- .slide: data-transition="zoom" --> ### 謝謝大家！ ### Thank you very much! ### ありがとございます。 --- ###### tags: `git` `簡報` `想知道嗎` `2018`