updated the bottom links, added stubs for next two sections
This commit is contained in:
Scott Chacon
parent
d5b2569426
commit
7261edd304
|
|
@ -67,19 +67,20 @@
|
|||
<div class="block">
|
||||
<h3><a href="/remotes">Sharing and Updating Projects</a></h3>
|
||||
<ul>
|
||||
<li><a href="/remotes/fetch-pull.html">fetch, pull</a></li>
|
||||
<li><a href="/remotes/push.html">push</a></li>
|
||||
<li><a href="/remotes/#fetch">fetch, pull</a></li>
|
||||
<li><a href="/remotes/#push">push</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="block">
|
||||
<h3><a href="/inspect">Inspection and Comparison</a></h3>
|
||||
<ul>
|
||||
<li><a href="/inspect/log.html">log</a></li>
|
||||
<li><a href="/inspect/diff.html">diff</a></li>
|
||||
<li><a href="/inspect/#log">log</a></li>
|
||||
<li><a href="/inspect/#diff">diff</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<!--
|
||||
<div class="block">
|
||||
<h3><a href="/fixing">Fixing and Changing History</a></h3>
|
||||
<ul>
|
||||
|
|
@ -90,7 +91,7 @@
|
|||
<li><a href="/fixing/cherry-pick.html">cherry-pick</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
-->
|
||||
</div>
|
||||
|
||||
<div class="grid_10 home_box" id="content_box">
|
||||
|
|
|
|||
|
|
@ -634,7 +634,7 @@ M hello.rb
|
|||
<span class="red">M</span> hello.rb
|
||||
</pre>
|
||||
|
||||
<p>Now you can run a <code>git commit</span> which will just record
|
||||
<p>Now you can run a <code>git commit</code> which will just record
|
||||
the changes to the <code>README</code> file, not the now unstaged
|
||||
<code>hello.rb</code>.
|
||||
</p>
|
||||
|
|
@ -735,5 +735,5 @@ M hello.rb
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<p><a href="/basic">On to Branching and Merging »</a></p>
|
||||
<p><a href="/branching">On to Branching and Merging »</a></p>
|
||||
|
||||
|
|
|
|||
|
|
@ -690,5 +690,5 @@ ab5ab4c added erlang
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<p><a href="/basic">On to Sharing and Updating Projects »</a></p>
|
||||
<p><a href="/remotes">On to Sharing and Updating Projects »</a></p>
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,50 @@
|
|||
---
|
||||
layout: reference
|
||||
---
|
||||
|
||||
<div class="box">
|
||||
<h2>
|
||||
<span class="docs">
|
||||
<a target="new" href="http://progit.org/book">book</a>
|
||||
</span>
|
||||
Inspection and Comparison
|
||||
</h2>
|
||||
<div class="block">
|
||||
<p class="nutshell">
|
||||
<b>In a nutshell</b> blah.
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="box">
|
||||
<h2>
|
||||
<span class="docs">
|
||||
<a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-log.html">docs</a>
|
||||
<a target="new" href="http://progit.org/book/">book</a>
|
||||
</span>
|
||||
<a name="log">git log</a>
|
||||
<span class="desc"></span>
|
||||
</h2>
|
||||
|
||||
<div class="block">
|
||||
<p>Cool.</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="box">
|
||||
<h2>
|
||||
<span class="docs">
|
||||
<a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-diff.html">docs</a>
|
||||
<a target="new" href="http://progit.org/book/">book</a>
|
||||
</span>
|
||||
<a name="diff">git diff</a>
|
||||
<span class="desc"></span>
|
||||
</h2>
|
||||
|
||||
<div class="block">
|
||||
<p>Cool.</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<p>And that's it! For more information, try reading the
|
||||
<a href="http://progit.org">Pro Git book</a>.</p>
|
||||
|
|
@ -0,0 +1,60 @@
|
|||
---
|
||||
layout: reference
|
||||
---
|
||||
|
||||
<div class="box">
|
||||
<h2>
|
||||
<span class="docs">
|
||||
<a target="new" href="http://progit.org/book">book</a>
|
||||
</span>
|
||||
Sharing and Updating Projects
|
||||
</h2>
|
||||
<div class="block">
|
||||
<p class="nutshell">
|
||||
<b>In a nutshell</b> you can update your project with <code>git fetch</code>
|
||||
and share your changes with <code>git push</code>.
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="box">
|
||||
<h2>
|
||||
<span class="docs">
|
||||
<a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-fetch.html">docs</a>
|
||||
<a target="new" href="http://progit.org/book/">book</a>
|
||||
</span>
|
||||
<a name="fetch">git fetch</a>
|
||||
<span class="desc">download new branches and data from a remote repository</span>
|
||||
</h2>
|
||||
|
||||
<br/>
|
||||
|
||||
<h2>
|
||||
<span class="docs">
|
||||
<a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-pull.html">docs</a>
|
||||
<a target="new" href="http://progit.org/book/">book</a>
|
||||
</span>
|
||||
<a name="pull">git pull</a>
|
||||
<span class="desc">fetch from a remote repo and try to merge into the current branch</span>
|
||||
</h2>
|
||||
<div class="block">
|
||||
<p>Cool.</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="box">
|
||||
<h2>
|
||||
<span class="docs">
|
||||
<a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-push.html">docs</a>
|
||||
<a target="new" href="http://progit.org/book/">book</a>
|
||||
</span>
|
||||
<a name="push">git push</a>
|
||||
<span class="desc">push your new branches and data to a remote repository</span>
|
||||
</h2>
|
||||
|
||||
<div class="block">
|
||||
<p>Cool.</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<p><a href="/inspect">On to Inspection and Comparison »</a></p>
|
||||
Loading…
Reference in New Issue