Skip to content

Commit 0a2c326

Browse files
schaconschacon
committed
basic layout and intro content
1 parent 8f9a1a3 commit 0a2c326

15 files changed

+2616
-0
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
_site

‎_layouts/reference.html

+108
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
2+
<html xmlns="http://www.w3.org/1999/xhtml">
3+
<head>
4+
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
5+
<title>Git Quick Reference</title>
6+
<link rel="stylesheet" type="text/css" href="/css/reset.css" media="screen" />
7+
<link rel="stylesheet" type="text/css" href="/css/text.css" media="screen" />
8+
<link rel="stylesheet" type="text/css" href="/css/grid.css" media="screen" />
9+
<link rel="stylesheet" type="text/css" href="/css/layout.css" media="screen" />
10+
<link rel="stylesheet" type="text/css" href="/css/nav.css" media="screen" />
11+
<!--[if IE 6]><link rel="stylesheet" type="text/css" href="/css/ie6.css" media="screen" /><![endif]-->
12+
<!--[if IE 7]><link rel="stylesheet" type="text/css" href="/css/ie.css" media="screen" /><![endif]-->
13+
<script type="text/javascript" src="/js/jquery-1.4.1.min.js"></script>
14+
<script type="text/javascript" src="/js/jquery-ui.min.js"></script>
15+
<script type="text/javascript" src="/js/action.js"></script>
16+
</head>
17+
<body>
18+
<div class="container_12">
19+
20+
<div class="grid_12">
21+
<span id="branding">Git Quick Reference</span>
22+
</div>
23+
24+
<div class="grid_12">
25+
<ul id="menu">
26+
<li><a id="menu_home" href="index.html">Reference</a></li>
27+
<li><a id="menu_recepies" href="#">Recipies</a></li>
28+
<li><a id="menu_about" href="#">About</a></li>
29+
<li>&#167;</li>
30+
<li><a href="http://github.com/schacon/git-reference">Site Source</a></li>
31+
</ul>
32+
<br/>
33+
&nbsp;
34+
</div>
35+
36+
<div class="grid_3" id="reflist">
37+
<div class="block">
38+
<h3><a href="#">Getting and Creating Projects</a></h3>
39+
<h4>Starting or copying a Git repository</h4>
40+
<ul>
41+
<li><a href="#">init</a></li>
42+
<li><a href="#">clone</a></li>
43+
</ul>
44+
</div>
45+
46+
<div class="block">
47+
<h3>Basic Snapshotting</h3>
48+
<h4>Saving your work</h4>
49+
<ul>
50+
<li><a href="#">add</a></li>
51+
<li><a href="#">status</a></li>
52+
<li><a href="#">diff</a></li>
53+
<li><a href="#">commit</a></li>
54+
<li><a href="#">rm, mv</a></li>
55+
<li><a href="#">reset</a></li>
56+
</ul>
57+
</div>
58+
59+
<div class="block">
60+
<h3>Branching and Merging</h3>
61+
<h4>Working in contexts</h4>
62+
<ul>
63+
<li><a href="#">branch</a></li>
64+
<li><a href="#">merge</a></li>
65+
<li><a href="#">checkout</a></li>
66+
<li><a href="#">cherry-pick</a></li>
67+
<li><a href="#">log</a></li>
68+
</ul>
69+
</div>
70+
71+
<div class="block">
72+
<h3>Sharing and Updating Projects</h3>
73+
<h4>Using Git to work with others</h4>
74+
<ul>
75+
<li><a href="#">fetch, pull</a></li>
76+
<li><a href="#">push</a></li>
77+
</ul>
78+
</div>
79+
80+
<div class="block">
81+
<h3>Inspection and Comparison</h3>
82+
<h4>Seeing what happened in your project</h4>
83+
<ul>
84+
<li><a href="#">log</a></li>
85+
<li><a href="#">diff</a></li>
86+
</ul>
87+
</div>
88+
89+
<div class="block">
90+
<h3>Fixing and Changing History</h3>
91+
<h4>Cleaning changes up and moving them around</h4>
92+
<ul>
93+
<li><a href="#">rebase</a></li>
94+
<li><a href="#">revert</a></li>
95+
<li><a href="#">checkout</a></li>
96+
</ul>
97+
</div>
98+
99+
</div>
100+
101+
<div class="grid_9 home_box" id="content_box">
102+
{{ content }}
103+
</div>
104+
105+
<div class="clear"></div>
106+
</div>
107+
</body>
108+
</html>

‎about.html

+69
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
<div class="grid_12" id="about_me">
2+
<div class="grid_6 alpha">
3+
<div class="box">
4+
<h2>About Me</h2>
5+
<br/>
6+
7+
<p>My name is Scott Chacon. I am a
8+
<a href="http://github.com/schacon">software developer</a>,
9+
<a href="http://git-scm.com">Git evangelist</a>, speaker,
10+
<a href="http://progit.org">writer</a>,
11+
<a href="http://www.tripit.com/people/schacon">world traveler</a>,
12+
father, husband, cat rescuer, baby signer
13+
and gorilla tamer.
14+
Not neccesarily in that order.</p>
15+
<p>This is my little bit-box on the web where I put
16+
stuff that people for some inconceivable reason
17+
might want to find out about me.</p>
18+
<p>I work at <a href="http://github.com">GitHub</a>. And it is awesome.</p>
19+
20+
<p>Some other interesting things I've done:
21+
<ul>
22+
<li>Had dinner with the Rwandan Minister of Science and Technology</li>
23+
<li>Did a scared E.T. impersonation in front of a crowd in Las Vegas</li>
24+
<li>Memorized the "Countries of the World Song" from Anamanics</li>
25+
<li>Ran for Congress (US House of Representatives, 11th District, CA)</li>
26+
<li>Had a mountain gorilla pull on my leg</li>
27+
<li>Ran a trail marathon on Mount Diablo</li>
28+
<li>Performed in Oklahoma! with Zach Levi (of NBCs Chuck)</li>
29+
<li>Flew over 100,000 miles to 31 cities in 13 countries since joining GitHub</li>
30+
</ul>
31+
</p>
32+
33+
<p>If you would like to know any more about any of these, please find me
34+
at a GitHub drinkup in your area, I'll tell you all about them.</p>
35+
36+
<h3>About Me (Professional Edition)</h3>
37+
38+
<p>I am a <a href="http://git-scm.com">Git</a> evangelist and Ruby
39+
developer working on <a href="http://github.com">GitHub.com</a>.
40+
I am the author of the <a href="http://progit.org">Pro Git</a> book
41+
by Apress, the <a href="https://peepcode.com/products/git-internals-pdf">Git Internals Peepcode <span class="caps">PDF</span></a>
42+
as well as the maintainer of the <a href="http://git-scm.com">Git homepage</a>
43+
and the <a href="http://book.git-scm.com">Git Community Book</a>.
44+
I have presented at <a id="menu_talks" href="#">a bunch of conferences</a>
45+
and a number of local groups and have done corporate training on Git
46+
across the country.</p>
47+
48+
<h3>About This Site</h3>
49+
50+
<p>This site is built using the Jekyll library and hosted on GitHub.
51+
The source code used to create this library is publicly available on
52+
GitHub as well.</p>
53+
</div>
54+
</div>
55+
<div class="grid_6 omega">
56+
<a href="http://www.flickr.com/photos/chacon/174667918/" title="Jessica and Scott at the Tetons by schacon, on Flickr">
57+
<img width="300" src="http://farm1.static.flickr.com/56/174667918_c29a05a91d.jpg" alt="Jessica and Scott at the Tetons" /></a>
58+
59+
<img width="300" src="http://farm5.static.flickr.com/4045/4318260674_05667bf79e.jpg"/>
60+
61+
<a href="http://www.flickr.com/photos/fraserspeirs/3395523242/sizes/m/in/set-72157615924425156/">
62+
<img width="300" src="http://farm4.static.flickr.com/3442/3395523242_107d9cec71.jpg"/></a>
63+
64+
<a href="http://www.flickr.com/photos/chacon/206680272/" title="Who is the Monkey? by schacon, on Flickr">
65+
<img width="300" src="http://farm1.static.flickr.com/59/206680272_d082087ea0.jpg" alt="Who is the Monkey?" /></a>
66+
67+
<img width="300" src="http://farm3.static.flickr.com/2636/4318263576_acec667e8b.jpg"/>
68+
</div>
69+
</div>

0 commit comments

Comments
 (0)