Skip to content

Commit

Permalink
basic layout and intro content
Browse files Browse the repository at this point in the history
  • Loading branch information
@schacon
schacon committed Jun 3, 2010
1 parent 8f9a1a3 commit 0a2c326
Show file tree
Hide file tree
Showing 15 changed files with 2,616 additions and 0 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
_site
108 changes: 108 additions & 0 deletions _layouts/reference.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>Git Quick Reference</title>
<link rel="stylesheet" type="text/css" href="/css/reset.css" media="screen" />
<link rel="stylesheet" type="text/css" href="/css/text.css" media="screen" />
<link rel="stylesheet" type="text/css" href="/css/grid.css" media="screen" />
<link rel="stylesheet" type="text/css" href="/css/layout.css" media="screen" />
<link rel="stylesheet" type="text/css" href="/css/nav.css" media="screen" />
<!--[if IE 6]><link rel="stylesheet" type="text/css" href="/css/ie6.css" media="screen" /><![endif]-->
<!--[if IE 7]><link rel="stylesheet" type="text/css" href="/css/ie.css" media="screen" /><![endif]-->
<script type="text/javascript" src="/js/jquery-1.4.1.min.js"></script>
<script type="text/javascript" src="/js/jquery-ui.min.js"></script>
<script type="text/javascript" src="/js/action.js"></script>
</head>
<body>
<div class="container_12">

<div class="grid_12">
<span id="branding">Git Quick Reference</span>
</div>

<div class="grid_12">
<ul id="menu">
<li><a id="menu_home" href="index.html">Reference</a></li>
<li><a id="menu_recepies" href="#">Recipies</a></li>
<li><a id="menu_about" href="#">About</a></li>
<li>&#167;</li>
<li><a href="http://github.com/schacon/git-reference">Site Source</a></li>
</ul>
<br/>
&nbsp;
</div>

<div class="grid_3" id="reflist">
<div class="block">
<h3><a href="#">Getting and Creating Projects</a></h3>
<h4>Starting or copying a Git repository</h4>
<ul>
<li><a href="#">init</a></li>
<li><a href="#">clone</a></li>
</ul>
</div>

<div class="block">
<h3>Basic Snapshotting</h3>
<h4>Saving your work</h4>
<ul>
<li><a href="#">add</a></li>
<li><a href="#">status</a></li>
<li><a href="#">diff</a></li>
<li><a href="#">commit</a></li>
<li><a href="#">rm, mv</a></li>
<li><a href="#">reset</a></li>
</ul>
</div>

<div class="block">
<h3>Branching and Merging</h3>
<h4>Working in contexts</h4>
<ul>
<li><a href="#">branch</a></li>
<li><a href="#">merge</a></li>
<li><a href="#">checkout</a></li>
<li><a href="#">cherry-pick</a></li>
<li><a href="#">log</a></li>
</ul>
</div>

<div class="block">
<h3>Sharing and Updating Projects</h3>
<h4>Using Git to work with others</h4>
<ul>
<li><a href="#">fetch, pull</a></li>
<li><a href="#">push</a></li>
</ul>
</div>

<div class="block">
<h3>Inspection and Comparison</h3>
<h4>Seeing what happened in your project</h4>
<ul>
<li><a href="#">log</a></li>
<li><a href="#">diff</a></li>
</ul>
</div>

<div class="block">
<h3>Fixing and Changing History</h3>
<h4>Cleaning changes up and moving them around</h4>
<ul>
<li><a href="#">rebase</a></li>
<li><a href="#">revert</a></li>
<li><a href="#">checkout</a></li>
</ul>
</div>

</div>

<div class="grid_9 home_box" id="content_box">
{{ content }}
</div>

<div class="clear"></div>
</div>
</body>
</html>
69 changes: 69 additions & 0 deletions about.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
<div class="grid_12" id="about_me">
<div class="grid_6 alpha">
<div class="box">
<h2>About Me</h2>
<br/>

<p>My name is Scott Chacon. I am a
<a href="http://github.com/schacon">software developer</a>,
<a href="http://git-scm.com">Git evangelist</a>, speaker,
<a href="http://progit.org">writer</a>,
<a href="http://www.tripit.com/people/schacon">world traveler</a>,
father, husband, cat rescuer, baby signer
and gorilla tamer.
Not neccesarily in that order.</p>
<p>This is my little bit-box on the web where I put
stuff that people for some inconceivable reason
might want to find out about me.</p>
<p>I work at <a href="http://github.com">GitHub</a>. And it is awesome.</p>

<p>Some other interesting things I've done:
<ul>
<li>Had dinner with the Rwandan Minister of Science and Technology</li>
<li>Did a scared E.T. impersonation in front of a crowd in Las Vegas</li>
<li>Memorized the "Countries of the World Song" from Anamanics</li>
<li>Ran for Congress (US House of Representatives, 11th District, CA)</li>
<li>Had a mountain gorilla pull on my leg</li>
<li>Ran a trail marathon on Mount Diablo</li>
<li>Performed in Oklahoma! with Zach Levi (of NBCs Chuck)</li>
<li>Flew over 100,000 miles to 31 cities in 13 countries since joining GitHub</li>
</ul>
</p>

<p>If you would like to know any more about any of these, please find me
at a GitHub drinkup in your area, I'll tell you all about them.</p>

<h3>About Me (Professional Edition)</h3>

<p>I am a <a href="http://git-scm.com">Git</a> evangelist and Ruby
developer working on <a href="http://github.com">GitHub.com</a>.
I am the author of the <a href="http://progit.org">Pro Git</a> book
by Apress, the <a href="https://peepcode.com/products/git-internals-pdf">Git Internals Peepcode <span class="caps">PDF</span></a>
as well as the maintainer of the <a href="http://git-scm.com">Git homepage</a>
and the <a href="http://book.git-scm.com">Git Community Book</a>.
I have presented at <a id="menu_talks" href="#">a bunch of conferences</a>
and a number of local groups and have done corporate training on Git
across the country.</p>

<h3>About This Site</h3>

<p>This site is built using the Jekyll library and hosted on GitHub.
The source code used to create this library is publicly available on
GitHub as well.</p>
</div>
</div>
<div class="grid_6 omega">
<a href="http://www.flickr.com/photos/chacon/174667918/" title="Jessica and Scott at the Tetons by schacon, on Flickr">
<img width="300" src="http://farm1.static.flickr.com/56/174667918_c29a05a91d.jpg" alt="Jessica and Scott at the Tetons" /></a>

<img width="300" src="http://farm5.static.flickr.com/4045/4318260674_05667bf79e.jpg"/>

<a href="http://www.flickr.com/photos/fraserspeirs/3395523242/sizes/m/in/set-72157615924425156/">
<img width="300" src="http://farm4.static.flickr.com/3442/3395523242_107d9cec71.jpg"/></a>

<a href="http://www.flickr.com/photos/chacon/206680272/" title="Who is the Monkey? by schacon, on Flickr">
<img width="300" src="http://farm1.static.flickr.com/59/206680272_d082087ea0.jpg" alt="Who is the Monkey?" /></a>

<img width="300" src="http://farm3.static.flickr.com/2636/4318263576_acec667e8b.jpg"/>
</div>
</div>
Loading

0 comments on commit 0a2c326

Please sign in to comment.