root
/
myBlogs_2


			
							123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763764765766767768769770771772773774775776777778779780781782783784785786787788789790791792793794795796797798799800801802803804805806807808
							
<!DOCTYPE HTML>
<html lang="" >
    <head>
        <meta charset="UTF-8">
        <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
        <title>git~F.A.Q · 代码收集</title>
        <meta http-equiv="X-UA-Compatible" content="IE=edge" />
        <meta name="description" content="">
        <meta name="generator" content="GitBook 3.1.1">
        
        
    <link rel="stylesheet" href="../gitbook/style.css">

    
                <link rel="stylesheet" href="../gitbook/gitbook-plugin-search-pro/search.css">
                
            
                <link rel="stylesheet" href="../gitbook/gitbook-plugin-highlight/website.css">
                
            
    <meta name="HandheldFriendly" content="true"/>
    <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
    <meta name="apple-mobile-web-app-capable" content="yes">
    <meta name="apple-mobile-web-app-status-bar-style" content="black">
    <link rel="apple-touch-icon-precomposed" sizes="152x152" href="../gitbook/images/apple-touch-icon-precomposed-152.png">
    <link rel="shortcut icon" href="../gitbook/images/favicon.ico" type="image/x-icon">


    <link rel="next" href="../node/0.html" />
    
    
    <link rel="prev" href="push.html" />
    

    </head>
    <body>
        
<div class="gb-page-wrapper">
    <header class="gb-page-header">
        <div class="container">
        
            
<div id="book-search-input" role="search">
    <input type="text" placeholder="Type to search" />
</div>


            <a href=".." class="logo">
                <img src="../gitbook/images/logo/128.png">
                <h1>代码收集</h1>
            </a>

            
<a href="https://github.com/seamong/myBlogs/blob/doc/git/faq.md" target="_blank" class="btn btn-link pull-right hidden-xs">
    <i class="octicon octicon-mark-github"></i> 在GitHub编辑本页
</a>
<a href="../faq.md" class="btn btn-link pull-right hidden-xs">
    F.A.Q
</a>
<a href="https://github.com/seamong/myBlogs/README.md" target="_blank" class="btn btn-link pull-right hidden-xs">
    当前版本0.0.1
</a>

        
        </div>
    </header>

    <div class="gb-page-body">
        <div class="gb-page-inner">
            <div class="container">
                <div class="row">
                    <div class="col-md-3">
                        

    <div class="panel panel-default">
        
        <div class="panel-heading">
            <h3 class="panel-title">介绍</h3>
        </div>
        

        <div class="list-group">
            
    
        <a href="../" class="list-group-item ">
        

            关于本文档

        
        </a>
        

        </div>
    </div>
    
    <div class="panel panel-default">
        
        <div class="panel-heading">
            <h3 class="panel-title">JavaScript</h3>
        </div>
        

        <div class="list-group">
            
    
        <a href="../JavaScript/principle/" class="list-group-item ">
        

            <i class="octicon octicon-chevron-right"></i>
            

            原理解析

        
        </a>
        

        <a href="../JavaScript/cases/" class="list-group-item ">
        

            <i class="octicon octicon-chevron-right"></i>
            

            案例解析

        
        </a>
        

        </div>
    </div>
    
    <div class="panel panel-default">
        
        <div class="panel-heading">
            <h3 class="panel-title">angular</h3>
        </div>
        

        <div class="list-group">
            
    
        <a href="../angular/study_notes/" class="list-group-item ">
        

            <i class="octicon octicon-chevron-right"></i>
            

            Study notes

        
        </a>
        

        <a href="../angular/ng.html" class="list-group-item ">
        

            ng

        
        </a>
        

        </div>
    </div>
    
    <div class="panel panel-default">
        
        <div class="panel-heading">
            <h3 class="panel-title">css</h3>
        </div>
        

        <div class="list-group">
            
    
        <a href="../css/principle/" class="list-group-item ">
        

            原理解析

        
        </a>
        

        <a href="../css/cases/" class="list-group-item ">
        

            <i class="octicon octicon-chevron-right"></i>
            

            案例收集

        
        </a>
        

        </div>
    </div>
    
    <div class="panel panel-default">
        
        <div class="panel-heading">
            <h3 class="panel-title">vue</h3>
        </div>
        

        <div class="list-group">
            
    
        <a href="../vue/components/" class="list-group-item ">
        

            <i class="octicon octicon-chevron-right"></i>
            

            components

        
        </a>
        

        <a href="../vue/router/" class="list-group-item ">
        

            <i class="octicon octicon-chevron-right"></i>
            

            router

        
        </a>
        

        <a href="../vue/vuex/" class="list-group-item ">
        

            VUE

        
        </a>
        

        </div>
    </div>
    
    <div class="panel panel-default">
        
        <div class="panel-heading">
            <h3 class="panel-title">ubuntu</h3>
        </div>
        

        <div class="list-group">
            
    
        <a href="../ubuntu/serves/" class="list-group-item ">
        

            <i class="octicon octicon-chevron-right"></i>
            

            服务器生存指南

        
        </a>
        

        <a href="../ubuntu/instruction.html" class="list-group-item ">
        

            常用指令

        
        </a>
        

        <a href="../ubuntu/software/" class="list-group-item ">
        

            常用软件安装

        
        </a>
        

        </div>
    </div>
    
    <div class="panel panel-default">
        
        <div class="panel-heading">
            <h3 class="panel-title">GIT</h3>
        </div>
        

        <div class="list-group">
            
    
        <a href="git.html" class="list-group-item ">
        

            git 命令

        
        </a>
        

        <a href="push.html" class="list-group-item ">
        

            git~push

        
        </a>
        

        <a href="faq.html" class="list-group-item active">
        

            git~F.A.Q

        
        </a>
        

        </div>
    </div>
    
    <div class="panel panel-default">
        
        <div class="panel-heading">
            <h3 class="panel-title">NODE&NPM</h3>
        </div>
        

        <div class="list-group">
            
    
        <a href="../node/0.html" class="list-group-item ">
        

            <i class="octicon octicon-chevron-right"></i>
            

            node

        
        </a>
        

        <a href="../node/npm/0.html" class="list-group-item ">
        

            npm

        
        </a>
        

        </div>
    </div>
    
    <div class="panel panel-default">
        

        <div class="list-group">
            
    
        <a href="../other/faq.html" class="list-group-item ">
        

            FAQ

        
        </a>
        

        <a href="../other/examples.html" class="list-group-item ">
        

            Examples

        
        </a>
        

        </div>
    </div>
    

                    </div>
                    <div class="col-md-9">
                        
<div id="book-search-results">
    <div class="search-noresults">
    
                            
                            <div class="gb-markdown book-page-inner">
                                <h1 id="gitfaq">git~F.A.Q</h1>
<p>&#x5728;git&#x7684;&#x4E00;&#x822C;&#x4F7F;&#x7528;&#x4E2D;&#xFF0C;&#x5982;&#x679C;&#x53D1;&#x73B0;&#x9519;&#x8BEF;&#x7684;&#x5C06;&#x4E0D;&#x60F3;&#x63D0;&#x4EA4;&#x7684;&#x6587;&#x4EF6;add&#x8FDB;&#x5165;index&#x4E4B;&#x540E;&#xFF0C;&#x60F3;&#x56DE;&#x9000;&#x53D6;&#x6D88;&#xFF0C;&#x5219;&#x53EF;&#x4EE5;&#x4F7F;&#x7528;&#x547D;&#x4EE4;&#xFF1A;git reset HEAD <file>...&#xFF0C;&#x540C;&#x65F6;git add&#x5B8C;&#x6BD5;&#x4E4B;&#x540E;&#xFF0C;git&#x4E5F;&#x4F1A;&#x505A;&#x76F8;&#x5E94;&#x7684;&#x63D0;&#x793A;&#xFF0C;&#x6BD4;&#x5982;&#xFF1A;
&#x5F15;&#x7528;</file></p>
<h1 id="changes-to-be-committed">Changes to be committed:</h1>
<h1 id="use-git-reset-head-to-unstage">(use &quot;git reset HEAD<file>...&quot; to unstage)</file></h1>
<p> #</p>
<h1 id="new-file-testscala">new file: Test.scala</h1>
<p>git reset [--hard|soft|mixed|merge|keep] [<commit>&#x6216;HEAD]&#xFF1A;&#x5C06;&#x5F53;&#x524D;&#x7684;&#x5206;&#x652F;&#x91CD;&#x8BBE;&#xFF08;reset&#xFF09;&#x5230;&#x6307;&#x5B9A;&#x7684;<commit>&#x6216;&#x8005;HEAD&#xFF08;&#x9ED8;&#x8BA4;&#xFF0C;&#x5982;&#x679C;&#x4E0D;&#x663E;&#x793A;&#x6307;&#x5B9A;commit&#xFF0C;&#x9ED8;&#x8BA4;&#x662F;HEAD&#xFF0C;&#x5373;&#x6700;&#x65B0;&#x7684;&#x4E00;&#x6B21;&#x63D0;&#x4EA4;&#xFF09;&#xFF0C;&#x5E76;&#x4E14;&#x6839;&#x636E;[mode]&#x6709;&#x53EF;&#x80FD;&#x66F4;&#x65B0;index&#x548C;working directory&#x3002;
&#x4E0B;&#x9762;&#x5217;&#x51FA;&#x4E00;&#x4E9B;git reset&#x7684;&#x5178;&#x578B;&#x7684;&#x5E94;&#x7528;&#x573A;&#x666F;&#xFF1A;
A) &#x56DE;&#x6EDA;add&#x64CD;&#x7EB5;
&#x5F15;&#x7528;</commit></commit></p>
<pre><code class="lang-bash"><span class="hljs-comment"># &#x7F16;&#x8F91;&#x6587;&#x4EF6;frotz.c, filfre.c&#xFF0C;&#x505A;&#x4E86;&#x4E9B;&#x66F4;&#x6539;&#xFF0C;&#x5E76;&#x628A;&#x66F4;&#x6539;&#x6DFB;&#x52A0;&#x5230;&#x4E86;index</span>
edit
git add frotz.c filfre.c
<span class="hljs-comment"># &#x67E5;&#x770B;&#x90AE;&#x4EF6;&#xFF0C;&#x53D1;&#x73B0;&#x67D0;&#x4EBA;&#x8981;&#x4F60;pull&#xFF0C;&#x6709;&#x4E00;&#x4E9B;&#x6539;&#x53D8;&#x9700;&#x8981;&#x4F60;merge&#x4E0B;&#x6765;</span>
mailx
<span class="hljs-comment"># &#x7136;&#x800C;&#xFF0C;&#x4F60;&#x5DF2;&#x7ECF;&#x628A;index&#x641E;&#x4E71;&#x4E86;&#xFF0C;&#x56E0;&#x4E3A;index&#x540C;HEAD commit&#x4E0D;&#x5339;&#x914D;&#x4E86;&#xFF0C;</span>
<span class="hljs-comment"># &#x4F46;&#x662F;&#x4F60;&#x77E5;&#x9053;&#xFF0C;&#x5373;&#x5C06;pull&#x7684;&#x4E1C;&#x897F;&#x4E0D;&#x4F1A;&#x5F71;&#x54CD;&#x5DF2;&#x7ECF;&#x4FEE;&#x6539;&#x7684;frotz.c&#x548C;filfre.c&#xFF0C;</span>
<span class="hljs-comment"># &#x56E0;&#x6B64;&#x4F60;&#x53EF;&#x4EE5;revert&#x8FD9;&#x4E24;&#x4E2A;&#x6587;&#x4EF6;&#x7684;&#x6539;&#x53D8;&#x3002;revert&#x540E;&#xFF0C;</span>
<span class="hljs-comment"># &#x90A3;&#x4E9B;&#x6539;&#x53D8;&#x5E94;&#x8BE5;&#x4F9D;&#x65E7;&#x5728;working directory&#x4E2D;&#xFF0C;&#x56E0;&#x6B64;&#x6267;&#x884C;git reset&#x3002;</span>
git reset
<span class="hljs-comment"># &#x7136;&#x540E;&#xFF0C;&#x6267;&#x884C;&#x4E86;pull&#x4E4B;&#x540E;&#xFF0C;&#x81EA;&#x52A8;merge&#xFF0C;</span>
<span class="hljs-comment"># frotz.c&#x548C;filfre.c&#x8FD9;&#x4E9B;&#x6539;&#x53D8;&#x4F9D;&#x7136;&#x5728;working directory&#x4E2D;&#x3002;</span>
$ git pull git://info.example.com/ nitfol (4)
</code></pre>
<p>B) &#x56DE;&#x6EDA;&#x6700;&#x8FD1;&#x4E00;&#x6B21;commit
&#x5F15;&#x7528;</p>
<pre><code class="lang-bash">git commit ...
<span class="hljs-comment"># &#x5F53;&#x63D0;&#x4EA4;&#x4E86;&#x4E4B;&#x540E;&#xFF0C;&#x4F60;&#x53C8;&#x53D1;&#x73B0;&#x4EE3;&#x7801;&#x6CA1;&#x6709;&#x63D0;&#x4EA4;&#x5B8C;&#x6574;&#xFF0C;</span>
<span class="hljs-comment"># &#x6216;&#x8005;&#x4F60;&#x60F3;&#x91CD;&#x65B0;&#x7F16;&#x8F91;&#x4E00;&#x4E0B;&#x63D0;&#x4EA4;&#x7684;comment&#xFF0C;</span>
<span class="hljs-comment"># &#x6267;&#x884C;git reset --soft HEAD^&#xFF0C;</span>
<span class="hljs-comment"># &#x8BA9;working tree&#x8FD8;&#x8DDF;reset&#x4E4B;&#x524D;&#x4E00;&#x6837;&#xFF0C;&#x4E0D;&#x4F5C;&#x4EFB;&#x4F55;&#x6539;&#x53D8;&#x3002;</span>
<span class="hljs-comment"># HEAD^&#x6307;&#x5411;HEAD&#x4E4B;&#x524D;&#x6700;&#x8FD1;&#x7684;&#x4E00;&#x6B21;commit&#x3002;</span>
git reset --soft HEAD^
<span class="hljs-comment"># &#x5BF9;working tree&#x4E0B;&#x7684;&#x6587;&#x4EF6;&#x505A;&#x4FEE;&#x6539;</span>
edit
<span class="hljs-comment"># &#x7136;&#x540E;&#x4F7F;&#x7528;reset&#x4E4B;&#x524D;&#x90A3;&#x6B21;commit&#x7684;&#x6CE8;&#x91CA;&#x3001;&#x4F5C;&#x8005;&#x3001;&#x65E5;&#x671F;&#x7B49;&#x4FE1;&#x606F;&#x91CD;&#x65B0;&#x63D0;&#x4EA4;&#x3002;</span>
<span class="hljs-comment"># &#x6CE8;&#x610F;&#xFF0C;&#x5F53;&#x6267;&#x884C;git reset&#x547D;&#x4EE4;&#x65F6;&#xFF0C;git&#x4F1A;&#x628A;&#x8001;&#x7684;HEAD&#x62F7;&#x8D1D;&#x5230;&#x6587;&#x4EF6;.git/ORIG_HEAD&#x4E2D;&#xFF0C;</span>
<span class="hljs-comment"># &#x5728;&#x547D;&#x4EE4;&#x4E2D;&#x53EF;&#x4EE5;&#x4F7F;&#x7528;ORIG_HEAD&#x5F15;&#x7528;&#x8FD9;&#x4E2A;commit&#x3002;</span>
<span class="hljs-comment"># commit &#x547D;&#x4EE4;&#x4E2D; -a &#x53C2;&#x6570;&#x7684;&#x610F;&#x601D;&#x662F;&#x544A;&#x8BC9;git&#xFF0C;</span>
<span class="hljs-comment"># &#x81EA;&#x52A8;&#x628A;&#x6240;&#x6709;&#x4FEE;&#x6539;&#x7684;&#x548C;&#x5220;&#x9664;&#x7684;&#x6587;&#x4EF6;&#x90FD;&#x653E;&#x8FDB;stage area&#xFF0C;&#x672A;&#x88AB;git&#x8DDF;&#x8E2A;&#x7684;&#x65B0;&#x5EFA;&#x7684;&#x6587;&#x4EF6;&#x4E0D;&#x53D7;&#x5F71;&#x54CD;&#x3002;</span>
<span class="hljs-comment"># commit&#x547D;&#x4EE4;&#x4E2D;-c &lt;commit&gt; &#x6216;&#x8005; -C &lt;commit&gt;&#x610F;&#x601D;&#x662F;&#x62FF;</span>
<span class="hljs-comment"># &#x5DF2;&#x7ECF;&#x63D0;&#x4EA4;&#x7684;commit&#x5BF9;&#x8C61;&#x4E2D;&#x7684;&#x4FE1;&#x606F;&#xFF08;&#x4F5C;&#x8005;&#xFF0C;&#x63D0;&#x4EA4;&#x8005;&#xFF0C;&#x6CE8;&#x91CA;&#xFF0C;&#x65F6;&#x95F4;&#x6233;&#x7B49;&#xFF09;&#x63D0;&#x4EA4;&#xFF0C;</span>
<span class="hljs-comment"># &#x90A3;&#x4E48;&#x8FD9;&#x6761;commit&#x547D;&#x4EE4;&#x7684;&#x610F;&#x601D;&#x5C31;&#x975E;&#x5E38;&#x6E05;&#x6670;&#x4E86;&#xFF0C;&#x628A;&#x6240;&#x6709;&#x66F4;&#x6539;&#x7684;&#x6587;&#x4EF6;&#x52A0;&#x5165;stage area&#xFF0C;</span>
<span class="hljs-comment"># &#x5E76;&#x4F7F;&#x7528;&#x4E0A;&#x6B21;&#x7684;&#x63D0;&#x4EA4;&#x4FE1;&#x606F;&#x91CD;&#x65B0;&#x63D0;&#x4EA4;&#x3002;</span>
git commit <span class="hljs-_">-a</span> -c ORIG_HEAD
</code></pre>
<p>C) &#x56DE;&#x6EDA;&#x6700;&#x8FD1;&#x51E0;&#x6B21;commit&#xFF0C;&#x5E76;&#x628A;&#x8FD9;&#x51E0;&#x6B21;commit&#x653E;&#x5230;&#x53EB;&#x505A;topic&#x7684;branch&#x4E0A;&#x53BB;&#x3002;
&#x5F15;&#x7528;</p>
<pre><code class="lang-bash"><span class="hljs-comment"># &#x4F60;&#x5DF2;&#x7ECF;&#x63D0;&#x4EA4;&#x4E86;&#x4E00;&#x4E9B;commit&#xFF0C;&#x4F46;&#x662F;&#x6B64;&#x65F6;&#x53D1;&#x73B0;&#x8FD9;&#x4E9B;commit&#x8FD8;&#x4E0D;&#x591F;&#x6210;&#x719F;&#xFF0C;</span>
<span class="hljs-comment"># &#x4E0D;&#x80FD;&#x8FDB;&#x5165;master&#x5206;&#x652F;&#xFF0C;&#x4F46;&#x4F60;&#x5E0C;&#x671B;&#x5728;&#x65B0;&#x7684;branch&#x4E0A;&#x6DA6;&#x8272;&#x8FD9;&#x4E9B;commit&#x6539;&#x52A8;&#x3002;</span>
<span class="hljs-comment"># &#x56E0;&#x6B64;&#x6267;&#x884C;&#x4E86;git branch&#x547D;&#x4EE4;&#x5728;&#x5F53;&#x524D;&#x7684;HEAD&#x4E0A;&#x5EFA;&#x7ACB;&#x4E86;&#x65B0;&#x7684;&#x53EB;&#x505A; topic/wip&#x7684;&#x5206;&#x652F;&#x3002;</span>
git branch topic/wip
<span class="hljs-comment"># &#x7136;&#x540E;&#x56DE;&#x6EDA;master branch&#x4E0A;&#x7684;&#x6700;&#x8FD1;&#x4E09;&#x6B21;&#x63D0;&#x4EA4;&#x3002;</span>
<span class="hljs-comment"># HEAD~3&#x6307;&#x5411;&#x5F53;&#x524D;HEAD-3&#x4E2A;commit&#x7684;commit&#xFF0C;</span>
<span class="hljs-comment"># git reset --hard HEAD~3&#x5373;&#x5220;&#x9664;&#x6700;&#x8FD1;&#x7684;&#x4E09;&#x4E2A;commit</span>
<span class="hljs-comment">#&#xFF08;&#x5220;&#x9664;HEAD, HEAD^, HEAD~2&#xFF09;&#xFF0C;&#x5C06;HEAD&#x6307;&#x5411;HEAD~3&#x3002;</span>
git reset --hard HEAD~3
<span class="hljs-comment"># &#x5207;&#x6362;&#x5230;`topic/wip` &#x5206;&#x652F;</span>
$ git checkout topic/wip
</code></pre>
<p>D) &#x6C38;&#x4E45;&#x5220;&#x9664;&#x6700;&#x540E;&#x51E0;&#x4E2A;commit</p>
<pre><code class="lang-bash">git commit ...
<span class="hljs-comment"># &#x6700;&#x540E;&#x4E09;&#x4E2A;commit&#xFF08;&#x5373;HEAD, HEAD^&#x548C;HEAD~2&#xFF09;&#x63D0;&#x4EA4;&#x6709;&#x95EE;&#x9898;&#xFF0C;&#x4F60;&#x60F3;&#x6C38;&#x4E45;&#x5220;&#x9664;&#x8FD9;&#x4E09;&#x4E2A;commit&#x3002;</span>
git reset --hard HEAD~3 (1)
</code></pre>
<p>E) &#x56DE;&#x6EDA;merge&#x548C;pull&#x64CD;&#x4F5C;
&#x5F15;&#x7528;</p>
<pre><code class="lang-bash"><span class="hljs-comment"># &#x4ECE;origin&#x62C9;&#x4E0B;&#x6765;&#x4E00;&#x4E9B;&#x66F4;&#x65B0;&#xFF0C;&#x4F46;&#x662F;&#x4EA7;&#x751F;&#x4E86;&#x5F88;&#x591A;&#x51B2;&#x7A81;&#xFF0C;</span>
<span class="hljs-comment"># &#x4F60;&#x6682;&#x65F6;&#x6CA1;&#x6709;&#x8FD9;&#x4E48;&#x591A;&#x65F6;&#x95F4;&#x53BB;&#x89E3;&#x51B3;&#x8FD9;&#x4E9B;&#x51B2;&#x7A81;&#xFF0C;&#x56E0;&#x6B64;&#x4F60;&#x51B3;&#x5B9A;&#x7A0D;&#x5019;&#x6709;&#x7A7A;&#x7684;&#x65F6;&#x5019;&#x518D;&#x91CD;&#x65B0;pull&#x3002;</span>
$ git pull
Auto-merging nitfol
CONFLICT (content): Merge conflict innitfol
Automatic merge failed; fix conflicts andthen commit the result.
<span class="hljs-comment"># &#x7531;&#x4E8E;pull&#x64CD;&#x4F5C;&#x4EA7;&#x751F;&#x4E86;&#x51B2;&#x7A81;&#xFF0C;&#x56E0;&#x6B64;&#x6240;&#x6709;pull&#x4E0B;&#x6765;&#x7684;&#x6539;&#x53D8;&#x5C1A;&#x672A;&#x63D0;&#x4EA4;&#xFF0C;</span>
<span class="hljs-comment"># &#x4ECD;&#x7136;&#x518D;stage area&#x4E2D;&#xFF0C;</span>
<span class="hljs-comment"># &#x8FD9;&#x79CD;&#x60C5;&#x51B5;&#x4E0B;git reset --hard&#x4E0E; git reset --hard HEAD&#x610F;&#x601D;&#x76F8;&#x540C;&#xFF0C;</span>
<span class="hljs-comment"># &#x5373;&#x90FD;&#x662F;&#x6E05;&#x9664;index&#x548C;working tree&#x4E2D;&#x88AB;&#x641E;&#x4E71;&#x7684;&#x4E1C;&#x897F;&#x3002;</span>
$ git reset --hard
<span class="hljs-comment"># &#x5C06;topic/branch&#x5408;&#x5E76;&#x5230;&#x5F53;&#x524D;&#x7684;branch&#xFF0C;&#x8FD9;&#x6B21;&#x6CA1;&#x6709;&#x4EA7;&#x751F;&#x51B2;&#x7A81;&#xFF0C;&#x5E76;&#x4E14;&#x5408;&#x5E76;&#x540E;&#x7684;&#x66F4;&#x6539;&#x81EA;&#x52A8;&#x63D0;&#x4EA4;&#x3002;</span>
$ git pull . topic/branch
Updating from 41223... to 13134...
Fast-forward
<span class="hljs-comment"># &#x4F46;&#x662F;&#x6B64;&#x65F6;&#x4F60;&#x53C8;&#x53D1;&#x73B0;&#x5C06;topic/branch&#x5408;&#x5E76;&#x8FC7;&#x6765;&#x4E3A;&#x65F6;&#x5C1A;&#x65E9;&#xFF0C;</span>
<span class="hljs-comment"># &#x56E0;&#x6B64;&#x51B3;&#x5B9A;&#x9000;&#x6EDA;merge&#xFF0C;&#x6267;&#x884C;git reset --hard ORIG_HEAD&#x56DE;&#x6EDA;&#x521A;&#x624D;&#x7684;pull/merge&#x64CD;&#x4F5C;&#x3002;</span>
<span class="hljs-comment"># &#x8BF4;&#x660E;&#xFF1A;&#x524D;&#x9762;&#x8BB2;&#x8FC7;&#xFF0C;&#x6267;&#x884C;git reset&#x65F6;&#xFF0C;</span>
<span class="hljs-comment"># git&#x4F1A;&#x628A;reset&#x4E4B;&#x524D;&#x7684;HEAD&#x653E;&#x5165;.git/ORIG_HEAD&#x6587;&#x4EF6;&#x4E2D;&#xFF0C;</span>
<span class="hljs-comment"># &#x547D;&#x4EE4;&#x884C;&#x4E2D;&#x4F7F;&#x7528;ORIG_HEAD&#x5F15;&#x7528;&#x8FD9;&#x4E2A;commit&#x3002;</span>
<span class="hljs-comment"># &#x540C;&#x6837;&#x7684;&#xFF0C;&#x6267;&#x884C;pull&#x548C;merge&#x64CD;&#x4F5C;&#x65F6;&#xFF0C;</span>
<span class="hljs-comment"># git&#x90FD;&#x4F1A;&#x628A;&#x6267;&#x884C;&#x64CD;&#x4F5C;&#x524D;&#x7684;HEAD&#x653E;&#x5165;ORIG_HEAD&#x4E2D;&#xFF0C;&#x4EE5;&#x9632;&#x56DE;&#x6EDA;&#x64CD;&#x4F5C;&#x3002;</span>
$ git reset --hard ORIG_HEAD
</code></pre>
<p>F) &#x5728;&#x88AB;&#x6C61;&#x67D3;&#x7684;working tree&#x4E2D;&#x56DE;&#x6EDA;merge&#x6216;&#x8005;pull
&#x5F15;&#x7528;</p>
<pre><code class="lang-bash"><span class="hljs-comment"># &#x5373;&#x4FBF;&#x4F60;&#x5DF2;&#x7ECF;&#x5728;&#x672C;&#x5730;&#x66F4;&#x6539;&#x4E86;&#x4E00;&#x4E9B;&#x4F60;&#x7684;working tree&#xFF0C;</span>
<span class="hljs-comment"># &#x4F60;&#x4E5F;&#x53EF;&#x5B89;&#x5168;&#x7684;git pull&#xFF0C;</span>
<span class="hljs-comment"># &#x524D;&#x63D0;&#x662F;&#x4F60;&#x77E5;&#x9053;&#x5C06;&#x8981;pull&#x7684;&#x5185;&#x5BB9;&#x4E0D;&#x4F1A;&#x8986;&#x76D6;&#x4F60;&#x7684;working tree&#x4E2D;&#x7684;&#x5185;&#x5BB9;&#x3002;</span>
$ git pull
Auto-merging nitfol
Merge made by recursive.
nitfol | 20 +++++----
...
<span class="hljs-comment"># git pull&#x5B8C;&#x540E;&#xFF0C;&#x4F60;&#x53D1;&#x73B0;&#x8FD9;&#x6B21;pull&#x4E0B;&#x6765;&#x7684;&#x4FEE;&#x6539;&#x4E0D;&#x6EE1;&#x610F;&#xFF0C;</span>
<span class="hljs-comment"># &#x60F3;&#x8981;&#x56DE;&#x6EDA;&#x5230;pull&#x4E4B;&#x524D;&#x7684;&#x72B6;&#x6001;&#xFF0C;&#x4ECE;&#x524D;&#x9762;&#x7684;&#x4ECB;&#x7ECD;&#x77E5;&#x9053;&#xFF0C;</span>
<span class="hljs-comment"># &#x6211;&#x4EEC;&#x53EF;&#x4EE5;&#x6267;&#x884C;git reset --hard ORIG_HEAD&#xFF0C;</span>
<span class="hljs-comment"># &#x4F46;&#x662F;&#x8FD9;&#x4E2A;&#x547D;&#x4EE4;&#x6709;&#x4E2A;&#x526F;&#x4F5C;&#x7528;&#x5C31;&#x662F;&#x6E05;&#x7A7A;&#x4F60;&#x7684;working tree&#xFF0C;</span>
<span class="hljs-comment"># &#x5373;&#x4E22;&#x5F03;&#x4F60;&#x7684;&#x672C;&#x5730;&#x672A;add&#x7684;&#x90A3;&#x4E9B;&#x6539;&#x53D8;&#x3002;&#x4E3A;&#x4E86;&#x907F;&#x514D;&#x4E22;&#x5F03;working tree&#x4E2D;&#x7684;&#x5185;&#x5BB9;&#xFF0C;</span>
<span class="hljs-comment"># &#x53EF;&#x4EE5;&#x4F7F;&#x7528;git reset --merge ORIG_HEAD&#xFF0C;</span>
<span class="hljs-comment"># &#x6CE8;&#x610F;&#x5176;&#x4E2D;&#x7684;--hard &#x6362;&#x6210;&#x4E86;--merge&#xFF0C;</span>
<span class="hljs-comment"># &#x8FD9;&#x6837;&#x5C31;&#x53EF;&#x4EE5;&#x907F;&#x514D;&#x5728;&#x56DE;&#x6EDA;&#x65F6;&#x6E05;&#x9664;working tree&#x3002;</span>
$ git reset --merge ORIG_HEAD (2)
</code></pre>
<p>G) &#x88AB;&#x4E2D;&#x65AD;&#x7684;&#x5DE5;&#x4F5C;&#x6D41;&#x7A0B;
&#x5728;&#x5B9E;&#x9645;&#x5F00;&#x53D1;&#x4E2D;&#x7ECF;&#x5E38;&#x51FA;&#x73B0;&#x8FD9;&#x6837;&#x7684;&#x60C5;&#x5F62;&#xFF1A;&#x4F60;&#x6B63;&#x5728;&#x5F00;&#x53D1;&#x4E00;&#x4E2A;&#x5927;&#x7684;feature&#xFF0C;&#x6B64;&#x65F6;&#x6765;&#x4E86;&#x4E00;&#x4E2A;&#x7D27;&#x6025;&#x7684;bug&#x9700;&#x8981;&#x4FEE;&#x590D;&#xFF0C;&#x4F46;&#x662F;&#x76EE;&#x524D;&#x5728;working tree&#x4E2D;&#x7684;&#x5185;&#x5BB9;&#x8FD8;&#x6CA1;&#x6709;&#x6210;&#x578B;&#xFF0C;&#x8FD8;&#x4E0D;&#x8DB3;&#x4EE5;commit&#xFF0C;&#x4F46;&#x662F;&#x4F60;&#x53C8;&#x5FC5;&#x987B;&#x5207;&#x6362;&#x7684;&#x53E6;&#x5916;&#x7684;branch&#x53BB;fix bug&#x3002;&#x8BF7;&#x770B;&#x4E0B;&#x9762;&#x7684;&#x4F8B;&#x5B50;</p>
<pre><code class="lang-bash">$ git checkout feature ;<span class="hljs-comment"># you were workingin &quot;feature&quot; branch and</span>
$ work work work ;<span class="hljs-comment">#got interrupted</span>
<span class="hljs-comment"># &#x8FD9;&#x6B21;&#x5C5E;&#x4E8E;&#x4E34;&#x65F6;&#x63D0;&#x4EA4;&#xFF0C;&#x56E0;&#x6B64;&#x968F;&#x4FBF;&#x6DFB;&#x52A0;&#x4E00;&#x4E2A;&#x4E34;&#x65F6;&#x6CE8;&#x91CA;&#x5373;&#x53EF;&#x3002;</span>
$ git commit <span class="hljs-_">-a</span> -m <span class="hljs-string">&quot;snapshot WIP&quot;</span>
$ git checkout master
$ fix fix fix
$ git commit ;<span class="hljs-comment"># commit with real log</span>
$ git checkout feature
<span class="hljs-comment"># &#x8FD9;&#x6B21;reset&#x5220;&#x9664;&#x4E86;WIP commit&#xFF0C;&#x5E76;&#x4E14;&#x628A;working tree&#x8BBE;&#x7F6E;&#x6210;&#x63D0;&#x4EA4;WIP&#x5FEB;&#x7167;&#x4E4B;&#x524D;&#x7684;&#x72B6;&#x6001;&#x3002;</span>
$ git reset --soft HEAD^ ;<span class="hljs-comment"># go back to WIPstate</span>
<span class="hljs-comment"># &#x6B64;&#x65F6;&#xFF0C;&#x5728;index&#x4E2D;&#x4F9D;&#x7136;&#x9057;&#x7559;&#x7740;&#x201C;snapshot WIP&#x201D;&#x63D0;&#x4EA4;&#x65F6;&#x6240;&#x505A;&#x7684;uncommit changes&#xFF0C;</span>
<span class="hljs-comment"># git reset&#x5C06;&#x4F1A;&#x6E05;&#x7406;index&#x6210;&#x4E3A;&#x5C1A;&#x672A;&#x63D0;&#x4EA4;&quot;snapshot WIP&quot;&#x65F6;&#x7684;&#x72B6;&#x6001;&#x4FBF;&#x4E8E;&#x63A5;&#x4E0B;&#x6765;&#x7EE7;&#x7EED;&#x5DE5;&#x4F5C;&#x3002;</span>
$ git reset
</code></pre>
<p>(H) Reset&#x5355;&#x72EC;&#x7684;&#x4E00;&#x4E2A;&#x6587;&#x4EF6;
&#x5047;&#x8BBE;&#x4F60;&#x5DF2;&#x7ECF;&#x6DFB;&#x52A0;&#x4E86;&#x4E00;&#x4E2A;&#x6587;&#x4EF6;&#x8FDB;&#x5165;index&#xFF0C;&#x4F46;&#x662F;&#x800C;&#x540E;&#x53C8;&#x4E0D;&#x6253;&#x7B97;&#x628A;&#x8FD9;&#x4E2A;&#x6587;&#x4EF6;&#x63D0;&#x4EA4;&#xFF0C;&#x6B64;&#x65F6;&#x53EF;&#x4EE5;&#x4F7F;&#x7528;git reset&#x628A;&#x8FD9;&#x4E2A;&#x6587;&#x4EF6;&#x4ECE;index&#x4E2D;&#x53BB;&#x9664;&#x3002;</p>
<pre><code class="lang-bash"><span class="hljs-comment"># &#x628A;&#x6587;&#x4EF6;frotz.c&#x4ECE;index&#x4E2D;&#x53BB;&#x9664;&#xFF0C;</span>
$ git reset -- frotz.c
<span class="hljs-comment"># &#x628A;index&#x4E2D;&#x7684;&#x6587;&#x4EF6;&#x63D0;&#x4EA4;</span>
$ git commit -m <span class="hljs-string">&quot;Commit files inindex&quot;</span>
<span class="hljs-comment"># &#x518D;&#x6B21;&#x628A;frotz.c&#x52A0;&#x5165;index</span>
$ git add frotz.c
</code></pre>
<p>(I) &#x4FDD;&#x7559;working tree&#x5E76;&#x4E22;&#x5F03;&#x4E00;&#x4E9B;&#x4E4B;&#x524D;&#x7684;commit
&#x5047;&#x8BBE;&#x4F60;&#x6B63;&#x5728;&#x7F16;&#x8F91;&#x4E00;&#x4E9B;&#x6587;&#x4EF6;&#xFF0C;&#x5E76;&#x4E14;&#x5DF2;&#x7ECF;&#x63D0;&#x4EA4;&#xFF0C;&#x63A5;&#x7740;&#x7EE7;&#x7EED;&#x5DE5;&#x4F5C;&#xFF0C;&#x4F46;&#x662F;&#x73B0;&#x5728;&#x4F60;&#x53D1;&#x73B0;&#x5F53;&#x524D;&#x5728;working tree&#x4E2D;&#x7684;&#x5185;&#x5BB9;&#x5E94;&#x8BE5;&#x5C5E;&#x4E8E;&#x53E6;&#x4E00;&#x4E2A;branch&#xFF0C;&#x4E0E;&#x8FD9;&#x4E4B;&#x524D;&#x7684;commit&#x6CA1;&#x6709;&#x4EC0;&#x4E48;&#x5173;&#x7CFB;&#x3002;&#x6B64;&#x65F6;&#xFF0C;&#x4F60;&#x53EF;&#x4EE5;&#x5F00;&#x542F;&#x4E00;&#x4E2A;&#x65B0;&#x7684;branch&#xFF0C;&#x5E76;&#x4E14;&#x4FDD;&#x7559;&#x7740;working tree&#x4E2D;&#x7684;&#x5185;&#x5BB9;&#x3002;</p>
<pre><code class="lang-bash">git tag start
git checkout -b branch1
edit
<span class="hljs-comment"># &#x8FD9;&#x6B21;&#x662F;&#x628A;&#x5728;branch1&#x4E2D;&#x7684;&#x6539;&#x53D8;&#x63D0;&#x4EA4;&#x4E86;&#x3002;</span>
git commit ...
edit
<span class="hljs-comment"># &#x6B64;&#x65F6;&#x53D1;&#x73B0;&#xFF0C;&#x4E4B;&#x524D;&#x7684;&#x63D0;&#x4EA4;&#x4E0D;&#x5C5E;&#x4E8E;&#x8FD9;&#x4E2A;branch&#xFF0C;&#x6B64;&#x65F6;&#x4F60;&#x65B0;&#x5EFA;&#x4E86;branch2&#xFF0C;&#x5E76;&#x5207;&#x6362;&#x5230;&#x4E86;branch2&#x4E0A;&#x3002;</span>
git checkout -b branch2
<span class="hljs-comment"># &#x6B64;&#x65F6;&#x4F60;&#x53EF;&#x4EE5;&#x7528;reset --keep&#x628A;&#x5728;start&#x4E4B;&#x540E;&#x7684;commit&#x6E05;&#x9664;&#x6389;&#xFF0C;&#x4F46;&#x662F;&#x4FDD;&#x6301;working tree&#x4E0D;&#x53D8;&#x3002;</span>
git reset --keep start
</code></pre>

                            </div>
                            
<hr>
<div class="btn-group btn-group-justified">
    
    <a class="btn" href="push.html"><b>上一页:</b> git~push</a>
    
    
    <a class="btn" href="../node/0.html"><b>下一页:</b> node</a>
    
</div>

                        
    </div>
    <div class="search-results">
        <div class="has-results">
            
            <h1 class="search-results-title"><span class='search-results-count'></span> results matching "<span class='search-query'></span>"</h1>
            <ul class="search-results-list"></ul>
            
        </div>
        <div class="no-results">
            
            <h1 class="search-results-title">No results matching "<span class='search-query'></span>"</h1>
            
        </div>
    </div>
</div>

                    </div>
                </div>
            </div>
        </div>
    </div>

    <footer class="gb-page-footer">
        <div class="container">
            <ul class="menu">
                <li class="pull-right">
                    <span class="service-info">Copyright GitBook 2018</span>
                </li>
                <li>
                    <a href="#">Return to the top</a>
                </li>
                <li>
                    <a href="#">Updated May 31st 18</a>
                </li>
            </ul>
        </div>
    </footer>
</div>

<script src="../gitbook/gitbook.js"></script>

    
    <script src="../gitbook/gitbook-plugin-search-pro/jquery.mark.min.js"></script>
    

    <script src="../gitbook/gitbook-plugin-search-pro/search.js"></script>
    

    <script src="../gitbook/gitbook-plugin-lunr/lunr.min.js"></script>
    

    <script src="../gitbook/gitbook-plugin-lunr/search-lunr.js"></script>
    

<script>
(function() {
    gitbook.page.hasChanged({"page":{"title":"git~F.A.Q","level":"7.3","depth":1,"next":{"title":"node","level":"8.1","depth":1,"path":"node/0.md","ref":"./node/0.md","articles":[{"title":"nodejs+phantomjs+nodemailer","level":"8.1.1","depth":2,"path":"node/01_nodejs_phantomjs_nodemailer.md","ref":"./node/01_nodejs_phantomjs_nodemailer.md","articles":[]}]},"previous":{"title":"git~push","level":"7.2","depth":1,"path":"git/push.md","ref":"./git/push.md","articles":[]},"dir":"ltr"},"config":{"plugins":["theme-official@2.1.1","-sharing","-fontsettings","sitemap","-search","search-pro"],"root":"./docs/","styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"},"pluginsConfig":{"sitemap":{"hostname":"https://blog.honghaitao.net/"},"search-pro":{"cutWordLib":"nodejieba","defineWord":["小需求","基础建设"]},"highlight":{},"lunr":{"maxIndexSize":1000000,"ignoreSpecialCharacters":false},"theme-official":{},"theme-default":{"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"},"showLevel":false}},"theme":"default","pdf":{"pageNumbers":true,"fontSize":12,"fontFamily":"Arial","paperSize":"a4","chapterMark":"pagebreak","pageBreaksBefore":"/","margin":{"right":62,"left":62,"top":56,"bottom":56}},"structure":{"langs":"LANGS.md","readme":"README.md","glossary":"GLOSSARY.md","summary":"SUMMARY.md"},"variables":{"version":"0.0.1"},"title":"代码收集","gitbook":"3.1.1"},"file":{"path":"git/faq.md","mtime":"2018-05-31T04:27:37.042Z","type":"markdown"},"gitbook":{"version":"3.1.1","time":"2018-05-31T08:39:58.544Z"},"basePath":"..","book":{"language":""}});
})();
</script>

        
    </body>
</html>