Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: gh-pages
Fetching contributors…

Cannot retrieve contributors at this time

232 lines (205 sloc) 8.88 kb
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Git Back Control of Your Code</title>
<meta name="description" content="A framework for easily creating beautiful presentations using HTML">
<meta name="author" content="Hakim El Hattab">
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
<link href='http://fonts.googleapis.com/css?family=Arvo:400,700,400italic,700italic' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="css/main.css">
<link rel="stylesheet" href="css/theme/activeadmin.css" id="theme">
<!-- For syntax highlighting -->
<link rel="stylesheet" href="lib/css/github.css">
<script>
// If the query includes 'print-pdf' we'll use the PDF print sheet
document.write( '<link rel="stylesheet" href="css/print/' + ( window.location.search.match( /print-pdf/gi ) ? 'pdf' : 'paper' ) + '.css" type="text/css" media="print">' );
</script>
<!--[if lt IE 9]>
<script src="lib/js/html5shiv.js"></script>
<![endif]-->
</head>
<body>
<div class="reveal">
<!-- Used to fade in a background when a specific slide state is reached -->
<div class="state-background"></div>
<!-- Any section element inside of this container is displayed as a slide -->
<div class="slides">
<section>
<div class="center-vertically">
<h1><span>Git Back Control of Your Code</span></h1>
<h2>Learning How to Manage Your Code with Git & GitHub</h2>
<br/><br/><br/><p>Press [Space] To Progress</p>
</div>
</section>
<section>
<div>
<h1><span>Who am I?</span></h1>
<h2>Brett Chalupa</h2>
</div>
</section>
<section>
<section>
<h1>What is <span>Version Control</span>?</h1>
<h2>define: version control</h2>
<h3><em>The task of keeping a software system consisting of many versions and configurations well organized.</em></h3>
</section>
<section>
<h1>Why use <span>Version Control</span>?</h1>
<ul>
<li>Confidence</li>
<li>Collaboration</li>
<li>Process</li>
</ul>
</section>
</section>
<section>
<section>
<h1>What is <span>Git</span>?</h1>
<h2>define: git</h2>
<h3><em>An extremely fast, efficient, distributed version control system ideal for the collaborative development of software.</em></h3>
</section>
<section>
<h1>Why use <span>Git</span>?</h1>
<ul>
<li>Distributed</li>
<li>Community</li>
<li>Tools</li>
</ul>
</section>
</section>
<section>
<section>
<h1>The <span>Git</span> Workflow</h1>
<ol>
<li><span>Initialize a Repo</span></li>
<li>Make changes to the codebase</li>
<li>Stage the modified files to be committed</li>
<li>Commit the changes</li>
<li>Push the changes</li>
</ol>
</section>
<section>
<h1>The <span>Git</span> Workflow</h1>
<h2>Creating a New Repository</h2>
<ol>
<li><code>git init</code></li>
<li><code>git status</code></li>
<li><code>git add changed_file.rb</code></li>
<li><code>git commit -m "change some files"</code></li>
<li><code>git push github master</code></li>
</ol>
</section>
<section>
<h1>The <span>Git</span> Workflow</h1>
<h2>Making Changes to an Existing Repository</h2>
<ol>
<li><code>git pull origin master</code></li>
<li><code>git status</code></li>
<li><code>git add changed_file.rb</code></li>
<li><code>git commit -m "change some files"</code></li>
<li><code>git push github master</code></li>
</ol>
</section>
<section>
<h1>The <span>Git</span> Workflow</h1>
<h2>Branching and Merging</h2>
<ol>
<li><code>git checkout -b bc/new_branch</code></li>
<li><code>git status</code></li>
<li><code>git add changed_file.rb</code></li>
<li><code>git commit -m "change some files"</code></li>
<li><code>git push github bc/new_branch</code></li>
</ol>
</section>
</section>
<section>
<h1>Other Useful <span>Git</span> Commands</h1>
<pre>
<code class="bash">
git diff # show the differences
git branch -a # show all branches, locally and remotely
git remote # list remotes
git remote -v # list remotes with detail
git reset --hard HEAD~1 # go back 1 commit before the head
git remote rename origin github # rename a remote
git stash # temporarily store your changes
git stash pop # pop stashed changes back on top
git stash drop # drop stashed changes
</code>
</pre>
</section>
<section>
<section>
<h1>What is <span>GitHub</span>?</h1>
<h2>define: github</h2>
<h3><em>Online project hosting using Git.</em></h3>
<img src="https://raw.github.com/github/media/master/octocats/octocat.png" alt="Octocat"/>
</section>
<section>
<h1>Why use <span>GitHub</span>?</h1>
<ul>
<li>Pull Request</li>
<li>Gists</li>
<li>In-line Comments</li>
<li>Wikis</li>
<li>Repository Forking</li>
<li>Issue &amp; Bug Tracking</li>
<li>Octocats</li>
</ul>
</section>
</section>
<section>
<h1>Try Git</h1>
<h2><a href="http://try.github.com/">http://try.github.com/</a></h2>
</section>
<section>
<h1>Additional Resources</h1>
<ul>
<li><a href="http://help.github.com">http://help.github.com</a></li>
<li><a href="http://scottr.org/presentations/git-in-5-minutes/">Git in 5 Minutes</a></li>
<li><a href="http://git-scm.com/videos">http://git-scm.com/videos</a></li>
</ul>
</section>
<section>
<h1>Thank you!</h1>
<h2><a href="http://bit.ly/gristmill-git-presentation">http://bit.ly/gristmill-git-presentation</a></h2>
<h2><a href="http://gristmill.io">http://gristmill.io</a></h2>
<h2><a href="http://brettchalupa.com">http://brettchalupa.com</a></h2>
</section>
</div>
<!-- The navigational controls UI -->
<aside class="controls">
<a class="left" href="#">&#x25C4;</a>
<a class="right" href="#">&#x25BA;</a>
<a class="up" href="#">&#x25B2;</a>
<a class="down" href="#">&#x25BC;</a>
</aside>
<!-- Presentation progress bar -->
<div class="progress"><span></span></div>
</div>
<script src="lib/js/head.min.js"></script>
<script src="js/reveal.min.js"></script>
<script>
// Full list of configuration options available here:
// https://github.com/hakimel/reveal.js#configuration
Reveal.initialize({
controls: true,
progress: true,
history: true,
theme: Reveal.getQueryHash().theme || 'activeadmin', // available themes are in /css/theme
transition: Reveal.getQueryHash().transition || 'activeadmin', // default/cube/page/concave/linear(2d)
// Optional libraries used to extend on reveal.js
dependencies: [
{ src: 'lib/js/highlight.js', async: true, callback: function() { window.hljs.initHighlightingOnLoad(); } },
{ src: 'lib/js/classList.js', condition: function() { return !document.body.classList; } },
{ src: 'lib/js/showdown.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
{ src: 'lib/js/data-markdown.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
{ src: '/socket.io/socket.io.js', async: true, condition: function() { return window.location.host === 'localhost:1947'; } },
{ src: 'plugin/speakernotes/client.js', async: true, condition: function() { return window.location.host === 'localhost:1947'; } },
]
});
</script>
</body>
</html>
Jump to Line
Something went wrong with that request. Please try again.