Autogenerated HTML docs for v1.9-rc0

author: Junio C Hamano <gitster@pobox.com> 2014-01-17 14:46:49 -0800
committer: Junio C Hamano <gitster@pobox.com> 2014-01-17 14:46:49 -0800
commit: 61525f915b47e953b4288a9afcee45e47b352214 (patch)
tree: f0649f89cc7a77c0296305f4673fc2bc7e0a6d54 /gittutorial.html
parent: bc8d4783cac3c942fc9e8cf2f3eae4aea8cab5cb (diff)
download: git-htmldocs-61525f915b47e953b4288a9afcee45e47b352214.tar.gz
1 files changed, 98 insertions, 94 deletions
diff --git a/gittutorial.html b/gittutorial.html
index 6c90f15e4..fd56d3681 100644
--- a/gittutorial.html
+++ b/gittutorial.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.6.8" />
+<meta name="generator" content="AsciiDoc 8.6.6" />
 <title>gittutorial(7)</title>
 <style type="text/css">
 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -87,15 +87,11 @@ ul, ol, li > p {
 ul > li     { color: #aaa; }
 ul > li > * { color: black; }
 
-.monospaced, code, pre {
-  font-family: "Courier New", Courier, monospace;
-  font-size: inherit;
-  color: navy;
+pre {
   padding: 0;
   margin: 0;
 }
 
-
 #author {
   color: #527bbd;
   font-weight: bold;
@@ -353,7 +349,7 @@ div.colist td img {
   margin-bottom: 0.1em;
 }
 
-div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
   margin-top: 0;
   margin-bottom: 0;
 }
@@ -411,14 +407,18 @@ span.underline { text-decoration: underline; }
 span.overline { text-decoration: overline; }
 span.line-through { text-decoration: line-through; }
 
-div.unbreakable { page-break-inside: avoid; }
-
 
 /*
  * xhtml11 specific
  *
  * */
 
+tt {
+  font-family: monospace;
+  font-size: inherit;
+  color: navy;
+}
+
 div.tableblock {
   margin-top: 1.0em;
   margin-bottom: 1.5em;
@@ -452,6 +452,12 @@ div.tableblock > table[frame="vsides"] {
  *
  * */
 
+.monospaced {
+  font-family: monospace;
+  font-size: inherit;
+  color: navy;
+}
+
 table.tableblock {
   margin-top: 1.0em;
   margin-bottom: 1.5em;
@@ -531,8 +537,6 @@ body.manpage div.sectionbody {
 @media print {
   body.manpage div#toc { display: none; }
 }
-
-
 </style>
 <script type="text/javascript">
 /*<![CDATA[*/
@@ -577,7 +581,7 @@ toc: function (toclevels) {
 
   function tocEntries(el, toclevels) {
     var result = new Array;
-    var re = new RegExp('[hH]([1-'+(toclevels+1)+'])');
+    var re = new RegExp('[hH]([2-'+(toclevels+1)+'])');
     // Function that scans the DOM tree for header elements (the DOM2
     // nodeIterator API would be a better technique but not supported by all
     // browsers).
@@ -606,7 +610,7 @@ toc: function (toclevels) {
   var i;
   for (i = 0; i < toc.childNodes.length; i++) {
     var entry = toc.childNodes[i];
-    if (entry.nodeName.toLowerCase() == 'div'
+    if (entry.nodeName == 'div'
      && entry.getAttribute("class")
      && entry.getAttribute("class").match(/^toclevel/))
       tocEntriesToRemove.push(entry);
@@ -652,7 +656,7 @@ footnotes: function () {
   var entriesToRemove = [];
   for (i = 0; i < noteholder.childNodes.length; i++) {
     var entry = noteholder.childNodes[i];
-    if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
+    if (entry.nodeName == 'div' && entry.getAttribute("class") == "footnote")
       entriesToRemove.push(entry);
   }
   for (i = 0; i < entriesToRemove.length; i++) {
@@ -760,15 +764,15 @@ changes to it, and share changes with other developers.</p></div>
 for example, to test the latest version, you may prefer to start with
 the first two chapters of <a href="user-manual.html">The Git User&#8217;s Manual</a>.</p></div>
 <div class="paragraph"><p>First, note that you can get documentation for a command such as
-<code>git log --graph</code> with:</p></div>
+<tt>git log --graph</tt> with:</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>$ man git-log</code></pre>
+<pre><tt>$ man git-log</tt></pre>
 </div></div>
 <div class="paragraph"><p>or:</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>$ git help log</code></pre>
+<pre><tt>$ git help log</tt></pre>
 </div></div>
 <div class="paragraph"><p>With the latter, you can use the manual viewer of your choice; see
 <a href="git-help.html">git-help(1)</a> for more information.</p></div>
@@ -777,8 +781,8 @@ public email address before doing any operation.  The easiest
 way to do so is:</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>$ git config --global user.name "Your Name Comes Here"
-$ git config --global user.email you@yourdomain.example.com</code></pre>
+<pre><tt>$ git config --global user.name "Your Name Comes Here"
+$ git config --global user.email you@yourdomain.example.com</tt></pre>
 </div></div>
 </div>
 </div>
@@ -789,14 +793,14 @@ $ git config --global user.email you@yourdomain.example.com</code></pre>
 can place it under Git revision control as follows.</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>$ tar xzf project.tar.gz
+<pre><tt>$ tar xzf project.tar.gz
 $ cd project
-$ git init</code></pre>
+$ git init</tt></pre>
 </div></div>
 <div class="paragraph"><p>Git will reply</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>Initialized empty Git repository in .git/</code></pre>
+<pre><tt>Initialized empty Git repository in .git/</tt></pre>
 </div></div>
 <div class="paragraph"><p>You&#8217;ve now initialized the working directory&#8212;you may notice a new
 directory created, named ".git".</p></div>
@@ -804,14 +808,14 @@ directory created, named ".git".</p></div>
 current directory (note the <em>.</em>), with <em>git add</em>:</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>$ git add .</code></pre>
+<pre><tt>$ git add .</tt></pre>
 </div></div>
 <div class="paragraph"><p>This snapshot is now stored in a temporary staging area which Git calls
 the "index".  You can permanently store the contents of the index in the
 repository with <em>git commit</em>:</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>$ git commit</code></pre>
+<pre><tt>$ git commit</tt></pre>
 </div></div>
 <div class="paragraph"><p>This will prompt you for a commit message.  You&#8217;ve now stored the first
 version of your project in Git.</p></div>
@@ -823,20 +827,20 @@ version of your project in Git.</p></div>
 <div class="paragraph"><p>Modify some files, then add their updated contents to the index:</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>$ git add file1 file2 file3</code></pre>
+<pre><tt>$ git add file1 file2 file3</tt></pre>
 </div></div>
 <div class="paragraph"><p>You are now ready to commit.  You can see what is about to be committed
 using <em>git diff</em> with the --cached option:</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>$ git diff --cached</code></pre>
+<pre><tt>$ git diff --cached</tt></pre>
 </div></div>
 <div class="paragraph"><p>(Without --cached, <em>git diff</em> will show you any changes that
 you&#8217;ve made but not yet added to the index.)  You can also get a brief
 summary of the situation with <em>git status</em>:</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>$ git status
+<pre><tt>$ git status
 # On branch master
 # Changes to be committed:
 #   (use "git reset HEAD &lt;file&gt;..." to unstage)
@@ -844,20 +848,20 @@ summary of the situation with <em>git status</em>:</p></div>
 #       modified:   file1
 #       modified:   file2
 #       modified:   file3
-#</code></pre>
+#</tt></pre>
 </div></div>
 <div class="paragraph"><p>If you need to make any further adjustments, do so now, and then add any
 newly modified content to the index.  Finally, commit your changes with:</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>$ git commit</code></pre>
+<pre><tt>$ git commit</tt></pre>
 </div></div>
 <div class="paragraph"><p>This will again prompt you for a message describing the change, and then
 record a new version of the project.</p></div>
 <div class="paragraph"><p>Alternatively, instead of running <em>git add</em> beforehand, you can use</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>$ git commit -a</code></pre>
+<pre><tt>$ git commit -a</tt></pre>
 </div></div>
 <div class="paragraph"><p>which will automatically notice any modified (but not new) files, add
 them to the index, and commit, all in one step.</p></div>
@@ -874,8 +878,8 @@ rest of the commit in the body.</p></div>
 <div class="sect1">
 <h2 id="_git_tracks_content_not_files">Git tracks content not files</h2>
 <div class="sectionbody">
-<div class="paragraph"><p>Many revision control systems provide an <code>add</code> command that tells the
-system to start tracking changes to a new file.  Git&#8217;s <code>add</code> command
+<div class="paragraph"><p>Many revision control systems provide an <tt>add</tt> command that tells the
+system to start tracking changes to a new file.  Git&#8217;s <tt>add</tt> command
 does something simpler and more powerful: <em>git add</em> is used both for new
 and newly modified files, and in both cases it takes a snapshot of the
 given files and stages that content in the index, ready for inclusion in
@@ -888,18 +892,18 @@ the next commit.</p></div>
 <div class="paragraph"><p>At any point you can view the history of your changes using</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>$ git log</code></pre>
+<pre><tt>$ git log</tt></pre>
 </div></div>
 <div class="paragraph"><p>If you also want to see complete diffs at each step, use</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>$ git log -p</code></pre>
+<pre><tt>$ git log -p</tt></pre>
 </div></div>
 <div class="paragraph"><p>Often the overview of the change is useful to get a feel of
 each step</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>$ git log --stat --summary</code></pre>
+<pre><tt>$ git log --stat --summary</tt></pre>
 </div></div>
 </div>
 </div>
@@ -910,18 +914,18 @@ each step</p></div>
 development.  To create a new branch named "experimental", use</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>$ git branch experimental</code></pre>
+<pre><tt>$ git branch experimental</tt></pre>
 </div></div>
 <div class="paragraph"><p>If you now run</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>$ git branch</code></pre>
+<pre><tt>$ git branch</tt></pre>
 </div></div>
 <div class="paragraph"><p>you&#8217;ll get a list of all existing branches:</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>  experimental
-* master</code></pre>
+<pre><tt>  experimental
+* master</tt></pre>
 </div></div>
 <div class="paragraph"><p>The "experimental" branch is the one you just created, and the
 "master" branch is a default branch that was created for you
@@ -929,52 +933,52 @@ automatically.  The asterisk marks the branch you are currently on;
 type</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>$ git checkout experimental</code></pre>
+<pre><tt>$ git checkout experimental</tt></pre>
 </div></div>
 <div class="paragraph"><p>to switch to the experimental branch.  Now edit a file, commit the
 change, and switch back to the master branch:</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>(edit file)
+<pre><tt>(edit file)
 $ git commit -a
-$ git checkout master</code></pre>
+$ git checkout master</tt></pre>
 </div></div>
 <div class="paragraph"><p>Check that the change you made is no longer visible, since it was
 made on the experimental branch and you&#8217;re back on the master branch.</p></div>
 <div class="paragraph"><p>You can make a different change on the master branch:</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>(edit file)
-$ git commit -a</code></pre>
+<pre><tt>(edit file)
+$ git commit -a</tt></pre>
 </div></div>
 <div class="paragraph"><p>at this point the two branches have diverged, with different changes
 made in each.  To merge the changes made in experimental into master, run</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>$ git merge experimental</code></pre>
+<pre><tt>$ git merge experimental</tt></pre>
 </div></div>
 <div class="paragraph"><p>If the changes don&#8217;t conflict, you&#8217;re done.  If there are conflicts,
 markers will be left in the problematic files showing the conflict;</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>$ git diff</code></pre>
+<pre><tt>$ git diff</tt></pre>
 </div></div>
 <div class="paragraph"><p>will show this.  Once you&#8217;ve edited the files to resolve the
 conflicts,</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>$ git commit -a</code></pre>
+<pre><tt>$ git commit -a</tt></pre>
 </div></div>
 <div class="paragraph"><p>will commit the result of the merge. Finally,</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>$ gitk</code></pre>
+<pre><tt>$ gitk</tt></pre>
 </div></div>
 <div class="paragraph"><p>will show a nice graphical representation of the resulting history.</p></div>
 <div class="paragraph"><p>At this point you could delete the experimental branch with</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>$ git branch -d experimental</code></pre>
+<pre><tt>$ git branch -d experimental</tt></pre>
 </div></div>
 <div class="paragraph"><p>This command ensures that the changes in the experimental branch are
 already in the current branch.</p></div>
@@ -982,7 +986,7 @@ already in the current branch.</p></div>
 delete the branch with</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>$ git branch -D crazy-idea</code></pre>
+<pre><tt>$ git branch -D crazy-idea</tt></pre>
 </div></div>
 <div class="paragraph"><p>Branches are cheap and easy, so this is a good way to try something
 out.</p></div>
@@ -997,7 +1001,7 @@ same machine, wants to contribute.</p></div>
 <div class="paragraph"><p>Bob begins with:</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>bob$ git clone /home/alice/project myrepo</code></pre>
+<pre><tt>bob$ git clone /home/alice/project myrepo</tt></pre>
 </div></div>
 <div class="paragraph"><p>This creates a new directory "myrepo" containing a clone of Alice&#8217;s
 repository.  The clone is on an equal footing with the original
@@ -1005,16 +1009,16 @@ project, possessing its own copy of the original project&#8217;s history.</p></d
 <div class="paragraph"><p>Bob then makes some changes and commits them:</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>(edit files)
+<pre><tt>(edit files)
 bob$ git commit -a
-(repeat as necessary)</code></pre>
+(repeat as necessary)</tt></pre>
 </div></div>
 <div class="paragraph"><p>When he&#8217;s ready, he tells Alice to pull changes from the repository
 at /home/bob/myrepo.  She does this with:</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>alice$ cd /home/alice/project
-alice$ git pull /home/bob/myrepo master</code></pre>
+<pre><tt>alice$ cd /home/alice/project
+alice$ git pull /home/bob/myrepo master</tt></pre>
 </div></div>
 <div class="paragraph"><p>This merges the changes from Bob&#8217;s "master" branch into Alice&#8217;s
 current branch.  If Alice has made her own changes in the meantime,
@@ -1034,8 +1038,8 @@ symbol "FETCH_HEAD", in order to determine if he has anything worth
 pulling, like this:</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>alice$ git fetch /home/bob/myrepo master
-alice$ git log -p HEAD..FETCH_HEAD</code></pre>
+<pre><tt>alice$ git fetch /home/bob/myrepo master
+alice$ git log -p HEAD..FETCH_HEAD</tt></pre>
 </div></div>
 <div class="paragraph"><p>This operation is safe even if Alice has uncommitted local changes.
 The range notation "HEAD..FETCH_HEAD" means "show everything that is reachable
@@ -1047,14 +1051,14 @@ seen with this command.</p></div>
 she can issue the following command:</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>$ gitk HEAD..FETCH_HEAD</code></pre>
+<pre><tt>$ gitk HEAD..FETCH_HEAD</tt></pre>
 </div></div>
 <div class="paragraph"><p>This uses the same two-dot range notation we saw earlier with <em>git log</em>.</p></div>
 <div class="paragraph"><p>Alice may want to view what both of them did since they forked.
 She can use three-dot form instead of the two-dot form:</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>$ gitk HEAD...FETCH_HEAD</code></pre>
+<pre><tt>$ gitk HEAD...FETCH_HEAD</tt></pre>
 </div></div>
 <div class="paragraph"><p>This means "show everything that is reachable from either one, but
 exclude anything that is reachable from both of them".</p></div>
@@ -1071,22 +1075,22 @@ again.  By defining <em>remote</em> repository shorthand, you can make
 it easier:</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>alice$ git remote add bob /home/bob/myrepo</code></pre>
+<pre><tt>alice$ git remote add bob /home/bob/myrepo</tt></pre>
 </div></div>
 <div class="paragraph"><p>With this, Alice can perform the first part of the "pull" operation
 alone using the <em>git fetch</em> command without merging them with her own
 branch, using:</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>alice$ git fetch bob</code></pre>
+<pre><tt>alice$ git fetch bob</tt></pre>
 </div></div>
 <div class="paragraph"><p>Unlike the longhand form, when Alice fetches from Bob using a
 remote repository shorthand set up with <em>git remote</em>, what was
 fetched is stored in a remote-tracking branch, in this case
-<code>bob/master</code>.  So after this:</p></div>
+<tt>bob/master</tt>.  So after this:</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>alice$ git log -p master..bob/master</code></pre>
+<pre><tt>alice$ git log -p master..bob/master</tt></pre>
 </div></div>
 <div class="paragraph"><p>shows a list of all the changes that Bob made since he branched from
 Alice&#8217;s master branch.</p></div>
@@ -1094,20 +1098,20 @@ Alice&#8217;s master branch.</p></div>
 could merge the changes into her master branch:</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>alice$ git merge bob/master</code></pre>
+<pre><tt>alice$ git merge bob/master</tt></pre>
 </div></div>
-<div class="paragraph"><p>This <code>merge</code> can also be done by <em>pulling from her own remote-tracking
+<div class="paragraph"><p>This <tt>merge</tt> can also be done by <em>pulling from her own remote-tracking
 branch</em>, like this:</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>alice$ git pull . remotes/bob/master</code></pre>
+<pre><tt>alice$ git pull . remotes/bob/master</tt></pre>
 </div></div>
 <div class="paragraph"><p>Note that git pull always merges into the current branch,
 regardless of what else is given on the command line.</p></div>
 <div class="paragraph"><p>Later, Bob can update his repo with Alice&#8217;s latest changes using</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>bob$ git pull</code></pre>
+<pre><tt>bob$ git pull</tt></pre>
 </div></div>
 <div class="paragraph"><p>Note that he doesn&#8217;t need to give the path to Alice&#8217;s repository;
 when Bob cloned Alice&#8217;s repository, Git stored the location of her
@@ -1115,24 +1119,24 @@ repository in the repository configuration, and that location is
 used for pulls:</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>bob$ git config --get remote.origin.url
-/home/alice/project</code></pre>
+<pre><tt>bob$ git config --get remote.origin.url
+/home/alice/project</tt></pre>
 </div></div>
 <div class="paragraph"><p>(The complete configuration created by <em>git clone</em> is visible using
-<code>git config -l</code>, and the <a href="git-config.html">git-config(1)</a> man page
+<tt>git config -l</tt>, and the <a href="git-config.html">git-config(1)</a> man page
 explains the meaning of each option.)</p></div>
 <div class="paragraph"><p>Git also keeps a pristine copy of Alice&#8217;s master branch under the
 name "origin/master":</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>bob$ git branch -r
-  origin/master</code></pre>
+<pre><tt>bob$ git branch -r
+  origin/master</tt></pre>
 </div></div>
 <div class="paragraph"><p>If Bob later decides to work from a different host, he can still
 perform clones and pulls using the ssh protocol:</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>bob$ git clone alice.org:/home/alice/project myrepo</code></pre>
+<pre><tt>bob$ git clone alice.org:/home/alice/project myrepo</tt></pre>
 </div></div>
 <div class="paragraph"><p>Alternatively, Git has a native protocol, or can use rsync or http;
 see <a href="git-pull.html">git-pull(1)</a> for details.</p></div>
@@ -1150,46 +1154,46 @@ Note that first line of each git log entry also gives a name for the
 commit:</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>$ git log
+<pre><tt>$ git log
 commit c82a22c39cbc32576f64f5c6b3f24b99ea8149c7
 Author: Junio C Hamano &lt;junkio@cox.net&gt;
 Date:   Tue May 16 17:18:22 2006 -0700
 
-    merge-base: Clarify the comments on post processing.</code></pre>
+    merge-base: Clarify the comments on post processing.</tt></pre>
 </div></div>
 <div class="paragraph"><p>We can give this name to <em>git show</em> to see the details about this
 commit.</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>$ git show c82a22c39cbc32576f64f5c6b3f24b99ea8149c7</code></pre>
+<pre><tt>$ git show c82a22c39cbc32576f64f5c6b3f24b99ea8149c7</tt></pre>
 </div></div>
 <div class="paragraph"><p>But there are other ways to refer to commits.  You can use any initial
 part of the name that is long enough to uniquely identify the commit:</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>$ git show c82a22c39c   # the first few characters of the name are
+<pre><tt>$ git show c82a22c39c   # the first few characters of the name are
                         # usually enough
 $ git show HEAD         # the tip of the current branch
-$ git show experimental # the tip of the "experimental" branch</code></pre>
+$ git show experimental # the tip of the "experimental" branch</tt></pre>
 </div></div>
 <div class="paragraph"><p>Every commit usually has one "parent" commit
 which points to the previous state of the project:</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>$ git show HEAD^  # to see the parent of HEAD
+<pre><tt>$ git show HEAD^  # to see the parent of HEAD
 $ git show HEAD^^ # to see the grandparent of HEAD
-$ git show HEAD~4 # to see the great-great grandparent of HEAD</code></pre>
+$ git show HEAD~4 # to see the great-great grandparent of HEAD</tt></pre>
 </div></div>
 <div class="paragraph"><p>Note that merge commits may have more than one parent:</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>$ git show HEAD^1 # show the first parent of HEAD (same as HEAD^)
-$ git show HEAD^2 # show the second parent of HEAD</code></pre>
+<pre><tt>$ git show HEAD^1 # show the first parent of HEAD (same as HEAD^)
+$ git show HEAD^2 # show the second parent of HEAD</tt></pre>
 </div></div>
 <div class="paragraph"><p>You can also give commits names of your own; after running</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>$ git tag v2.5 1b2e1d63ff</code></pre>
+<pre><tt>$ git tag v2.5 1b2e1d63ff</tt></pre>
 </div></div>
 <div class="paragraph"><p>you can refer to 1b2e1d63ff by the name "v2.5".  If you intend to
 share this name with other people (for example, to identify a release
@@ -1199,11 +1203,11 @@ version), you should create a "tag" object, and perhaps sign it; see
 names.  For example:</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>$ git diff v2.5 HEAD     # compare the current HEAD to v2.5
+<pre><tt>$ git diff v2.5 HEAD     # compare the current HEAD to v2.5
 $ git branch stable v2.5 # start a new branch named "stable" based
                          # at v2.5
 $ git reset --hard HEAD^ # reset your current branch and working
-                         # directory to its state at HEAD^</code></pre>
+                         # directory to its state at HEAD^</tt></pre>
 </div></div>
 <div class="paragraph"><p>Be careful with that last command: in addition to losing any changes
 in the working directory, it will also remove all later commits from
@@ -1217,25 +1221,25 @@ instead.</p></div>
 project, so</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>$ git grep "hello" v2.5</code></pre>
+<pre><tt>$ git grep "hello" v2.5</tt></pre>
 </div></div>
 <div class="paragraph"><p>searches for all occurrences of "hello" in v2.5.</p></div>
 <div class="paragraph"><p>If you leave out the commit name, <em>git grep</em> will search any of the
 files it manages in your current directory.  So</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>$ git grep "hello"</code></pre>
+<pre><tt>$ git grep "hello"</tt></pre>
 </div></div>
 <div class="paragraph"><p>is a quick way to search just the files that are tracked by Git.</p></div>
 <div class="paragraph"><p>Many Git commands also take sets of commits, which can be specified
 in a number of ways.  Here are some examples with <em>git log</em>:</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>$ git log v2.5..v2.6            # commits between v2.5 and v2.6
+<pre><tt>$ git log v2.5..v2.6            # commits between v2.5 and v2.6
 $ git log v2.5..                # commits since v2.5
 $ git log --since="2 weeks ago" # commits from the last 2 weeks
 $ git log v2.5.. Makefile       # commits since v2.5 which modify
-                                # Makefile</code></pre>
+                                # Makefile</tt></pre>
 </div></div>
 <div class="paragraph"><p>You can also give <em>git log</em> a "range" of commits where the first is not
 necessarily an ancestor of the second; for example, if the tips of
@@ -1243,13 +1247,13 @@ the branches "stable" and "master" diverged from a common
 commit some time ago, then</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>$ git log stable..master</code></pre>
+<pre><tt>$ git log stable..master</tt></pre>
 </div></div>
 <div class="paragraph"><p>will list commits made in the master branch but not in the
 stable branch, while</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>$ git log master..stable</code></pre>
+<pre><tt>$ git log master..stable</tt></pre>
 </div></div>
 <div class="paragraph"><p>will show the list of commits made on the stable branch but not
 the master branch.</p></div>
@@ -1262,7 +1266,7 @@ or Git itself) have frequent merges, and <em>gitk</em> does a better job of
 visualizing their history.  For example,</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>$ gitk --since="2 weeks ago" drivers/</code></pre>
+<pre><tt>$ gitk --since="2 weeks ago" drivers/</tt></pre>
 </div></div>
 <div class="paragraph"><p>allows you to browse any commits from the last 2 weeks of commits
 that modified files under the "drivers" directory.  (Note: you can
@@ -1273,12 +1277,12 @@ to precede any filename by a commit, to specify a particular version
 of the file:</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>$ git diff v2.5:Makefile HEAD:Makefile.in</code></pre>
+<pre><tt>$ git diff v2.5:Makefile HEAD:Makefile.in</tt></pre>
 </div></div>
 <div class="paragraph"><p>You can also use <em>git show</em> to see any such file:</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><code>$ git show v2.5:Makefile</code></pre>
+<pre><tt>$ git show v2.5:Makefile</tt></pre>
 </div></div>
 </div>
 </div>
author	Junio C Hamano <gitster@pobox.com>	2014-01-17 14:46:49 -0800
committer	Junio C Hamano <gitster@pobox.com>	2014-01-17 14:46:49 -0800
commit	61525f915b47e953b4288a9afcee45e47b352214 (patch)
tree	f0649f89cc7a77c0296305f4673fc2bc7e0a6d54 /gittutorial.html
parent	bc8d4783cac3c942fc9e8cf2f3eae4aea8cab5cb (diff)
download	git-htmldocs-61525f915b47e953b4288a9afcee45e47b352214.tar.gz