|
|
|
@ -5,7 +5,7 @@ layout: zh_reference |
|
|
|
|
<div class="box"> |
|
|
|
|
<h2> |
|
|
|
|
<span class="docs"> |
|
|
|
|
<a target="new" href="http://progit.org/book/ch3-0.html">书</a> |
|
|
|
|
<a target="new" href="http://git-scm.com/book/en/Git-Branching">书</a> |
|
|
|
|
</span> |
|
|
|
|
分支与合并 |
|
|
|
|
</h2> |
|
|
|
@ -29,8 +29,8 @@ layout: zh_reference |
|
|
|
|
<div class="box"> |
|
|
|
|
<h2> |
|
|
|
|
<span class="docs"> |
|
|
|
|
<a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-branch.html">文档</a> |
|
|
|
|
<a target="new" href="http://progit.org/book/ch3-2.html">书</a> |
|
|
|
|
<a target="new" href="http://git-scm.com/docs/git-branch">文档</a> |
|
|
|
|
<a target="new" href="http://git-scm.com/book/en/Git-Branching-What-a-Branch-Is">书</a> |
|
|
|
|
</span> |
|
|
|
|
<a name="branch">git branch</a> |
|
|
|
|
<span class="desc">列出、创建与管理工作上下文</span> |
|
|
|
@ -40,8 +40,8 @@ layout: zh_reference |
|
|
|
|
|
|
|
|
|
<h2> |
|
|
|
|
<span class="docs"> |
|
|
|
|
<a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-checkout.html">文档</a> |
|
|
|
|
<a target="new" href="http://progit.org/book/ch3-2.html">书</a> |
|
|
|
|
<a target="new" href="http://git-scm.com/docs/git-checkout">文档</a> |
|
|
|
|
<a target="new" href="http://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging">书</a> |
|
|
|
|
</span> |
|
|
|
|
<a name="checkout">git checkout</a> |
|
|
|
|
<span class="desc">切换到新的分支上下文</span> |
|
|
|
@ -59,7 +59,7 @@ layout: zh_reference |
|
|
|
|
</h4> |
|
|
|
|
|
|
|
|
|
<p>没有参数时,<code>git branch</code> 会列出你在本地的分支。你所在的分支的行首会有个星号作标记。 |
|
|
|
|
如果你开启了<a href="http://progit.org/book/ch7-1.html#colors_in_git">彩色模式</a>,当前分支会用绿色显示。 |
|
|
|
|
如果你开启了<a href="http://git-scm.com/book/en/Customizing-Git-Git-Configuration#Colors-in-Git">彩色模式</a>,当前分支会用绿色显示。 |
|
|
|
|
</p> |
|
|
|
|
|
|
|
|
|
<pre> |
|
|
|
@ -199,8 +199,8 @@ Deleted branch testing (was 78b2670). |
|
|
|
|
<div class="box"> |
|
|
|
|
<h2> |
|
|
|
|
<span class="docs"> |
|
|
|
|
<a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-merge.html">docs</a> |
|
|
|
|
<a target="new" href="http://progit.org/book/ch3-2.html#basic_merging">book</a> |
|
|
|
|
<a target="new" href="http://git-scm.com/docs/git-merge">docs</a> |
|
|
|
|
<a target="new" href="http://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging#Basic-Merging">book</a> |
|
|
|
|
</span> |
|
|
|
|
<a name="merge">git merge</a> |
|
|
|
|
<span class="desc">将分支合并到你的当前分支</span> |
|
|
|
@ -380,7 +380,7 @@ nearly every programming language. |
|
|
|
|
|
|
|
|
|
<p>你可以看到,Git 在产生合并冲突的地方插入了标准的与 Subversion 很像的合并冲突标记。 |
|
|
|
|
轮到我们去解决这些冲突了。在这里我们就手动把它解决。如果你要 Git 打开一个图形化的合并工具, |
|
|
|
|
可以看看 <a href="http://www.kernel.org/pub/software/scm/git/docs/git-mergetool.html">git 合并工具</a> |
|
|
|
|
可以看看 <a href="http://git-scm.com/docs/git-mergetool">git 合并工具</a> |
|
|
|
|
(比如 kdiff3、emerge、p4merge 等)。 |
|
|
|
|
</p> |
|
|
|
|
|
|
|
|
@ -428,8 +428,8 @@ M README |
|
|
|
|
<div class="box"> |
|
|
|
|
<h2> |
|
|
|
|
<span class="docs"> |
|
|
|
|
<a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-log.html">文档</a> |
|
|
|
|
<a target="new" href="http://progit.org/book/ch6-1.html#commit_ranges">书</a> |
|
|
|
|
<a target="new" href="http://git-scm.com/docs/git-log">文档</a> |
|
|
|
|
<a target="new" href="http://git-scm.com/book/en/Git-Tools-Revision-Selection#Commit-Ranges">书</a> |
|
|
|
|
</span> |
|
|
|
|
<a name="log">git log</a> |
|
|
|
|
<span class="desc">显示一个分支中提交的更改记录</span> |
|
|
|
@ -619,8 +619,8 @@ ab5ab4c added erlang |
|
|
|
|
<div class="box"> |
|
|
|
|
<h2> |
|
|
|
|
<span class="docs"> |
|
|
|
|
<a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-tag.html">文档</a> |
|
|
|
|
<a target="new" href="http://progit.org/book/ch2-6.html">书</a> |
|
|
|
|
<a target="new" href="http://git-scm.com/docs/git-tag">文档</a> |
|
|
|
|
<a target="new" href="http://git-scm.com/book/en/Git-Basics-Tagging">书</a> |
|
|
|
|
</span> |
|
|
|
|
<a name="tag">git tag</a> |
|
|
|
|
<span class="desc">给历史记录中的某个重要的一点打上标签</span> |
|
|
|
|