Skip to content

Commit 7261edd

Browse files
committed
updated the bottom links, added stubs for next two sections
1 parent d5b2569 commit 7261edd

File tree

5 files changed

+119
-8
lines changed

5 files changed

+119
-8
lines changed

_layouts/reference.html

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,19 +67,20 @@ <h3><a href="/branching">Branching and Merging</a></h3>
6767
<div class="block">
6868
<h3><a href="/remotes">Sharing and Updating Projects</a></h3>
6969
<ul>
70-
<li><a href="/remotes/fetch-pull.html">fetch, pull</a></li>
71-
<li><a href="/remotes/push.html">push</a></li>
70+
<li><a href="/remotes/#fetch">fetch, pull</a></li>
71+
<li><a href="/remotes/#push">push</a></li>
7272
</ul>
7373
</div>
7474

7575
<div class="block">
7676
<h3><a href="/inspect">Inspection and Comparison</a></h3>
7777
<ul>
78-
<li><a href="/inspect/log.html">log</a></li>
79-
<li><a href="/inspect/diff.html">diff</a></li>
78+
<li><a href="/inspect/#log">log</a></li>
79+
<li><a href="/inspect/#diff">diff</a></li>
8080
</ul>
8181
</div>
8282

83+
<!--
8384
<div class="block">
8485
<h3><a href="/fixing">Fixing and Changing History</a></h3>
8586
<ul>
@@ -90,7 +91,7 @@ <h3><a href="/fixing">Fixing and Changing History</a></h3>
9091
<li><a href="/fixing/cherry-pick.html">cherry-pick</a></li>
9192
</ul>
9293
</div>
93-
94+
-->
9495
</div>
9596

9697
<div class="grid_10 home_box" id="content_box">

basic/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -634,7 +634,7 @@ <h2>
634634
<span class="red">M</span> hello.rb
635635
</pre>
636636

637-
<p>Now you can run a <code>git commit</span> which will just record
637+
<p>Now you can run a <code>git commit</code> which will just record
638638
the changes to the <code>README</code> file, not the now unstaged
639639
<code>hello.rb</code>.
640640
</p>
@@ -735,5 +735,5 @@ <h4>
735735
</div>
736736
</div>
737737

738-
<p><a href="/basic">On to Branching and Merging &#187;</a></p>
738+
<p><a href="/branching">On to Branching and Merging &#187;</a></p>
739739

branching/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -690,5 +690,5 @@ <h2>
690690
</div>
691691
</div>
692692

693-
<p><a href="/basic">On to Sharing and Updating Projects &#187;</a></p>
693+
<p><a href="/remotes">On to Sharing and Updating Projects &#187;</a></p>
694694

inspect/index.html

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
---
2+
layout: reference
3+
---
4+
5+
<div class="box">
6+
<h2>
7+
<span class="docs">
8+
<a target="new" href="http://progit.org/book">book</a>
9+
</span>
10+
Inspection and Comparison
11+
</h2>
12+
<div class="block">
13+
<p class="nutshell">
14+
<b>In a nutshell</b> blah.
15+
</p>
16+
</div>
17+
</div>
18+
19+
<div class="box">
20+
<h2>
21+
<span class="docs">
22+
<a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-log.html">docs</a> &nbsp;
23+
<a target="new" href="http://progit.org/book/">book</a>
24+
</span>
25+
<a name="log">git log</a>
26+
<span class="desc"></span>
27+
</h2>
28+
29+
<div class="block">
30+
<p>Cool.</p>
31+
</div>
32+
</div>
33+
34+
<div class="box">
35+
<h2>
36+
<span class="docs">
37+
<a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-diff.html">docs</a> &nbsp;
38+
<a target="new" href="http://progit.org/book/">book</a>
39+
</span>
40+
<a name="diff">git diff</a>
41+
<span class="desc"></span>
42+
</h2>
43+
44+
<div class="block">
45+
<p>Cool.</p>
46+
</div>
47+
</div>
48+
49+
<p>And that's it! For more information, try reading the
50+
<a href="http://progit.org">Pro Git book</a>.</p>

remotes/index.html

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
---
2+
layout: reference
3+
---
4+
5+
<div class="box">
6+
<h2>
7+
<span class="docs">
8+
<a target="new" href="http://progit.org/book">book</a>
9+
</span>
10+
Sharing and Updating Projects
11+
</h2>
12+
<div class="block">
13+
<p class="nutshell">
14+
<b>In a nutshell</b> you can update your project with <code>git fetch</code>
15+
and share your changes with <code>git push</code>.
16+
</p>
17+
</div>
18+
</div>
19+
20+
<div class="box">
21+
<h2>
22+
<span class="docs">
23+
<a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-fetch.html">docs</a> &nbsp;
24+
<a target="new" href="http://progit.org/book/">book</a>
25+
</span>
26+
<a name="fetch">git fetch</a>
27+
<span class="desc">download new branches and data from a remote repository</span>
28+
</h2>
29+
30+
<br/>
31+
32+
<h2>
33+
<span class="docs">
34+
<a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-pull.html">docs</a> &nbsp;
35+
<a target="new" href="http://progit.org/book/">book</a>
36+
</span>
37+
<a name="pull">git pull</a>
38+
<span class="desc">fetch from a remote repo and try to merge into the current branch</span>
39+
</h2>
40+
<div class="block">
41+
<p>Cool.</p>
42+
</div>
43+
</div>
44+
45+
<div class="box">
46+
<h2>
47+
<span class="docs">
48+
<a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-push.html">docs</a> &nbsp;
49+
<a target="new" href="http://progit.org/book/">book</a>
50+
</span>
51+
<a name="push">git push</a>
52+
<span class="desc">push your new branches and data to a remote repository</span>
53+
</h2>
54+
55+
<div class="block">
56+
<p>Cool.</p>
57+
</div>
58+
</div>
59+
60+
<p><a href="/inspect">On to Inspection and Comparison &#187;</a></p>

0 commit comments

Comments
 (0)