padding-left: 0.5em;\r
}\r
</style>\r
-<title>A short git tutorial</title>\r
+<title>A git core tutorial for developers</title>\r
</head>\r
<body>\r
<div id="header">\r
-<h1>A short git tutorial</h1>\r
+<h1>A git core tutorial for developers</h1>\r
</div>\r
<h2>Introduction</h2>\r
<div class="sectionbody">\r
<div class="content">\r
<pre><tt>$ git checkout mybranch\r
$ echo "Work, work, work" >>hello\r
-$ git commit -m 'Some work.' hello</tt></pre>\r
+$ git commit -m 'Some work.' -i hello</tt></pre>\r
</div></div>\r
<p>Here, we just added another line to <tt>hello</tt>, and we used a shorthand for\r
doing both <tt>git-update-index hello</tt> and <tt>git commit</tt> by just giving the\r
<div class="content">\r
<pre><tt>$ echo "Play, play, play" >>hello\r
$ echo "Lots of fun" >>example\r
-$ git commit -m 'Some fun.' hello example</tt></pre>\r
+$ git commit -m 'Some fun.' -i hello example</tt></pre>\r
</div></div>\r
<p>since the master branch is obviously in a much better mood.</p>\r
<p>Now, you've got two branches, and you decide that you want to merge the\r
<p>and once you're happy with your manual merge, just do a</p>\r
<div class="listingblock">\r
<div class="content">\r
-<pre><tt>$ git commit hello</tt></pre>\r
+<pre><tt>$ git commit -i hello</tt></pre>\r
</div></div>\r
<p>which will very loudly warn you that you're now committing a merge\r
(which is correct, so never mind), and you can write a small merge\r
<p>The first two lines indicate that it is showing the two branches\r
and the first line of the commit log message from their\r
top-of-the-tree commits, you are currently on <tt>master</tt> branch\r
-(notice the asterisk <tt><strong></tt> character), and the first column for\r
+(notice the asterisk <tt>*</tt> character), and the first column for\r
the later output lines is used to show commits contained in the\r
<tt>master</tt> branch, and the second column for the <tt>mybranch</tt>\r
branch. Three commits are shown along with their log messages.\r
-All of them have non blank characters in the first column (<tt></strong></tt>\r
+All of them have non blank characters in the first column (<tt>*</tt>\r
shows an ordinary commit on the current branch, <tt>.</tt> is a merge commit), which\r
means they are now part of the <tt>master</tt> branch. Only the "Some\r
work" commit has the plus <tt>+</tt> character in the second column,\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Feb-2006 03:24:18 UTC\r
+Last updated 30-May-2006 07:20:51 UTC\r
</div>\r
</div>\r
</body>\r