Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Added more content to the hands on section

  • Loading branch information...
commit 10700c539b2392036f4cb51b5d38ac18bff6369a 1 parent f83513d
@mephraim mephraim authored
View
135 hands_on/make_commit.htm
@@ -0,0 +1,135 @@
+<!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" xml:lang="en" lang="en" id="mysite-com">
+
+<head>
+
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>Git for Writers: Making a Commit</title>
+
+ <link rel="stylesheet" type="text/css" media="screen, print" href="../css/reset.css" />
+ <link rel="stylesheet" type="text/css" media="screen" href="../css/screen.css" />
+ <!--[if lte IE 7>
+ <link rel="stylesheet" type="text/css" media="screen" href="css/screen-ie.css" />
+ <![endif]-->
+ <link rel="stylesheet" type="text/css" media="print" href="../css/print.css" />
+
+<!--REMOVE COMMENT TAGS TO USE FACEBOOK SHARE METADATA:-->
+
+<!--
+ <meta name="title" content="Match this with the content of the title tag above." />
+ <meta name="description" content="A short description of this page." />
+ <link rel="image_src" href="http://example.com/media/share/thumbnail.jpg" />
+-->
+
+<!--REMOVE COMMENT TAGS TO USE FAVICON LINKS:-->
+
+<!--
+ <link rel="icon" href="" type="image/png" />
+ <link rel="shortcut icon" href="" type="image/png" />
+-->
+
+ <script type="text/javascript" src="../js/mootools/mootools-core.js"></script>
+ <script type="text/javascript" src="../js/site.js"></script>
+
+</head>
+
+<body>
+
+<div id="page">
+
+ <div id="header">
+
+ <h1><a href="http://gewga.ws/git-for-writers/" rel="home">Git for Writers</a></h1>
+
+ <p class="tagline">
+ A guide to version tracking, revision, and collaboration for open-source writing.
+ </p>
+
+ <ul class="accessibility">
+ <li><a href="#navigation">Jump to Navigation</a></li>
+ <li><a href="#content">Jump to Content</a></li>
+ </ul>
+
+ </div>
+
+ <div id="content">
+
+ <div id="main">
+ <h2>Making a Commit</h2>
+ <p>
+ <span class="note">Explain what making a commit does.</span>
+ </p>
+ <h3>Check Status</h3>
+ <p>
+ <span class="note">Explain how to check status (to see which files are staged).</span>
+ <pre>git status</pre>
+ </p>
+ <p>
+ <span class="note">Explain response from Git.</span>
+<pre># On branch master
+#
+# Initial commit
+#
+# Changes to be committed:
+# (use "git rm --cached &lt;file&gt;..." to unstage)
+#
+# <span class="good">new file: filename.html</span>
+# <span class="good">new file: filename2.html</span></pre>
+ </p>
+
+ <h3>Commit Staged Files</h3>
+ <p>
+ <span class="note">Explain how to commit all staged files.</span>
+ <span class="note">Explain what the -m flag means.</span>
+ <pre>git commit -m"I added a new paragraph"</pre>
+ </p>
+
+ <p>
+ <span class="note">Explain response from Git.</span>
+ <pre>2 files changed, 0 insertions(+), 0 deletions(-)</pre>
+ </p>
+ <h3>Stage and Commit in One Step</h3>
+ <p>
+ <span class="note">Explain how to stage and commit all changed file at once.</span>
+ </p>
+ <pre>git commit -am"I made a lot of changes"</pre>
+ </div>
+
+ <div id="supporting">
+ </div>
+
+ </div>
+
+ <ul id="navigation">
+ <li><a href="index.htm">Home</a></li>
+ <li><a href="resources.htm">Resources</a></li>
+ <li><a href="about.htm">About</a></li>
+ </ul>
+
+ <div id="footer">
+ <p class="copyright">
+ © 2010 by Gewgaws Lab. Some rights reserved. Content licensed under a
+ <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/us/">
+ Creative Commons Attribution-Share Alike 3.0 United States License
+ </a>.
+ <a class="cc-badge" rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/us/">
+ <img alt="Creative Commons License" src="http://i.creativecommons.org/l/by-sa/3.0/us/88x31.png" />
+ </a>
+ </p>
+ <p class="project-information">
+ <a href="http://github.com/gewgaws/git-for-writers">Git for Writers repository</a>
+ hosted at <a href="http://github.com">GitHub</a>. Learn <a href="participate.htm">how to
+ contribute</a> to Git for Writers.
+ </p>
+ <ul class="validators">
+ <li><a href="http://validator.w3.org/check?uri=referer" title="Validate this page's XHTML">XHTML</a></li>
+ <li><a href="http://jigsaw.w3.org/css-validator/check/referer" title="Validate this page's CSS">CSS</a></li>
+ </ul>
+ </div>
+
+</div>
+
+</body>
+
+</html>
+
View
13 hands_on/new_project.htm
@@ -4,7 +4,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>Git for Writers: Page Title Here</title>
+ <title>Git for Writers: Creating a New Project</title>
<link rel="stylesheet" type="text/css" media="screen, print" href="../css/reset.css" />
<link rel="stylesheet" type="text/css" media="screen" href="../css/screen.css" />
@@ -55,7 +55,16 @@
<div id="content">
<div id="main">
- <h2>Creating a new project</h2>
+ <h2>Creating a New Project</h2>
+ <h3>Initialize the Project</h3>
+ <p>
+ <span class="note">Explain what creating a new project does.</span>
+ <pre>git init</pre>
+ </p>
+ <p>
+ <span class="note">Explain response from git.</span>
+ <pre>Initialized empty Git repository in /my_project/.git/</pre>
+ </p>
</div>
<div id="supporting">
View
151 hands_on/stage_commit.htm
@@ -0,0 +1,151 @@
+<!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" xml:lang="en" lang="en" id="mysite-com">
+
+<head>
+
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>Git for Writers: Creating a New Project</title>
+
+ <link rel="stylesheet" type="text/css" media="screen, print" href="../css/reset.css" />
+ <link rel="stylesheet" type="text/css" media="screen" href="../css/screen.css" />
+ <!--[if lte IE 7>
+ <link rel="stylesheet" type="text/css" media="screen" href="css/screen-ie.css" />
+ <![endif]-->
+ <link rel="stylesheet" type="text/css" media="print" href="../css/print.css" />
+
+<!--REMOVE COMMENT TAGS TO USE FACEBOOK SHARE METADATA:-->
+
+<!--
+ <meta name="title" content="Match this with the content of the title tag above." />
+ <meta name="description" content="A short description of this page." />
+ <link rel="image_src" href="http://example.com/media/share/thumbnail.jpg" />
+-->
+
+<!--REMOVE COMMENT TAGS TO USE FAVICON LINKS:-->
+
+<!--
+ <link rel="icon" href="" type="image/png" />
+ <link rel="shortcut icon" href="" type="image/png" />
+-->
+
+ <script type="text/javascript" src="../js/mootools/mootools-core.js"></script>
+ <script type="text/javascript" src="../js/site.js"></script>
+
+</head>
+
+<body>
+
+<div id="page">
+
+ <div id="header">
+
+ <h1><a href="http://gewga.ws/git-for-writers/" rel="home">Git for Writers</a></h1>
+
+ <p class="tagline">
+ A guide to version tracking, revision, and collaboration for open-source writing.
+ </p>
+
+ <ul class="accessibility">
+ <li><a href="#navigation">Jump to Navigation</a></li>
+ <li><a href="#content">Jump to Content</a></li>
+ </ul>
+
+ </div>
+
+ <div id="content">
+
+ <div id="main">
+ <h2>Staging a Commit</h2>
+ <p>
+ <span class="note">Explain what staging a commit does.</span>
+ </p>
+
+ <h3>Check Status</h3>
+ <p>
+ <span class="note">Instruct user to change some files.</span><br />
+ <span class="note">Explain how to check status (to see what files have changed).</span>
+ <pre>git status</pre>
+ </p>
+ <p>
+ <span class="note">Explain response from Git.</span>
+<pre># On branch master
+#
+# Initial commit
+#
+# Untracked files:
+# (use "git add &lt;file&gt;..." to include in what will be committed)
+#
+# <span class="warn">filename.html</span></pre>
+ </p>
+
+ <h3>Stage Files</h3>
+ <p>
+ <span class="note">Explain how to add single file.</span>
+ <pre>git add filename.html</pre>
+ </p>
+
+ <p>
+ <span class="note">Explain how to add multiple files.</span>
+ <pre>git add filename.html filename2.html</pre>
+ </p>
+
+ <p>
+ <span class="note">Explain how to add all files.</span>
+ <pre>git add .</pre>
+ </p>
+
+ <h3>Check Status Again</h3>
+ <p>
+ <pre>git status</pre>
+<pre># On branch master
+#
+# Initial commit
+#
+# Changes to be committed:
+# (use "git rm --cached &lt;file&gt;..." to unstage)
+#
+# <span class="good">new file: filename.html</span>
+# <span class="good">new file: filename2.html</span></pre>
+ <span class="note">Explain response from Git.</span>
+ </p>
+ </div>
+
+ <div id="supporting">
+ </div>
+
+ </div>
+
+ <ul id="navigation">
+ <li><a href="index.htm">Home</a></li>
+ <li><a href="resources.htm">Resources</a></li>
+ <li><a href="about.htm">About</a></li>
+ </ul>
+
+ <div id="footer">
+ <p class="copyright">
+ © 2010 by Gewgaws Lab. Some rights reserved. Content licensed under a
+ <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/us/">
+ Creative Commons Attribution-Share Alike 3.0 United States License
+ </a>.
+ <a class="cc-badge" rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/us/">
+ <img alt="Creative Commons License" src="http://i.creativecommons.org/l/by-sa/3.0/us/88x31.png" />
+ </a>
+ </p>
+ <p class="project-information">
+ <a href="http://github.com/gewgaws/git-for-writers">Git for Writers repository</a>
+ hosted at <a href="http://github.com">GitHub</a>. Learn <a href="participate.htm">how to
+ contribute</a> to Git for Writers.
+ </p>
+ <ul class="validators">
+ <li><a href="http://validator.w3.org/check?uri=referer" title="Validate this page's XHTML">XHTML</a></li>
+ <li><a href="http://jigsaw.w3.org/css-validator/check/referer" title="Validate this page's CSS">CSS</a></li>
+ </ul>
+ </div>
+
+</div>
+
+</body>
+
+</html>
+
+
View
36 index.htm
@@ -84,32 +84,36 @@
<li class="concepts">
<h4>Concepts</h4>
<ol>
- <li>Git Versus Track Changes</li>
- <li>Maintaining History</li>
- <li>Possible Futures</li>
- <li>Test Like Nobody&#8217;s Watching</li>
+ <li>Git Versus Track Changes</li>
+ <li>Maintaining History</li>
+ <li>Possible Futures</li>
+ <li>Test Like Nobody&#8217;s Watching</li>
</ol>
</li>
<li class="hands-on">
<h4>Hands-On</h4>
<ol>
- <li>Git Setups</li>
- <li>
- <a href="hands_on/create_project.htm">Creating a New Project</a>
- </li>
- <li>Staging a Commit</li>
- <li>Making a Commit</li>
- <li>Reviewing History</li>
- <li>Rolling Back</li>
- <li>Branching Sideways</li>
+ <li>Git Setups</li>
+ <li>
+ <a href="hands_on/new_project.htm">Creating a New Project</a>
+ </li>
+ <li>
+ <a href="hands_on/stage_commit.htm">Staging a Commit</a>
+ </li>
+ <li>
+ <a href="hands_on/make_commit.htm">Making a Commit</a>
+ </li>
+ <li>Reviewing History</li>
+ <li>Rolling Back</li>
+ <li>Branching Sideways</li>
</ol>
</li>
<li class="scenarios">
<h4>Scenarios</h4>
<ol>
- <li>Plain Text To-Do List</li>
- <li>Personal Web Site</li>
- <li>WordPress Template</li>
+ <li>Plain Text To-Do List</li>
+ <li>Personal Web Site</li>
+ <li>WordPress Template</li>
</ol>
</li>
</ul>
Please sign in to comment.
Something went wrong with that request. Please try again.