Autogenerated HTML docs for v2.26.2-357-g86ab1

1 files changed, 213 insertions, 213 deletions

diff --git a/user-manual.html b/user-manual.html
index 24cc51cb7..126cbd815 100644
--- a/user-manual.html
+++ b/user-manual.html
@@ -6,13 +6,13 @@ to build and test a particular version of a software project, search for
 regressions, and so on.</p><p>People needing to do actual development will also want to read
 <a class="xref" href="#Developing-With-git" title="Chapter 3. Developing with Git">Chapter 3, <i>Developing with Git</i></a> and <a class="xref" href="#sharing-development" title="Chapter 4. Sharing development with others">Chapter 4, <i>Sharing development with others</i></a>.</p><p>Further chapters cover more specialized topics.</p><p>Comprehensive reference documentation is available through the man
 pages, or <a class="ulink" href="git-help.html" target="_top">git-help(1)</a> command.  For example, for the command
-<code class="literal">git clone &lt;repo&gt;</code>, you can either use:</p><pre class="literallayout">$ man git-clone</pre><p>or:</p><pre class="literallayout">$ git help clone</pre><p>With the latter, you can use the manual viewer of your choice; see
+<code class="literal">git clone &lt;repo&gt;</code>, you can either use:</p><pre class="screen">$ man git-clone</pre><p>or:</p><pre class="screen">$ git help clone</pre><p>With the latter, you can use the manual viewer of your choice; see
 <a class="ulink" href="git-help.html" target="_top">git-help(1)</a> for more information.</p><p>See also <a class="xref" href="#git-quick-start" title="Appendix A. Git Quick Reference">Appendix A, <i>Git Quick Reference</i></a> for a brief overview of Git commands,
 without any explanation.</p><p>Finally, see <a class="xref" href="#todo" title="Appendix B. Notes and todo list for this manual">Appendix B, <i>Notes and todo list for this manual</i></a> for ways that you can help make this manual more
 complete.</p></div><div class="chapter"><div class="titlepage"><div><div><h1 class="title"><a name="repositories-and-branches"></a>Chapter 1. Repositories and Branches</h1></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl class="toc"><dt><span class="section"><a href="#how-to-get-a-git-repository">How to get a Git repository</a></span></dt><dt><span class="section"><a href="#how-to-check-out">How to check out a different version of a project</a></span></dt><dt><span class="section"><a href="#understanding-commits">Understanding History: Commits</a></span></dt><dd><dl><dt><span class="section"><a href="#understanding-reachability">Understanding history: commits, parents, and reachability</a></span></dt><dt><span class="section"><a href="#history-diagrams">Understanding history: History diagrams</a></span></dt><dt><span class="section"><a href="#what-is-a-branch">Understanding history: What is a branch?</a></span></dt></dl></dd><dt><span class="section"><a href="#manipulating-branches">Manipulating branches</a></span></dt><dt><span class="section"><a href="#detached-head">Examining an old version without creating a new branch</a></span></dt><dt><span class="section"><a href="#examining-remote-branches">Examining branches from a remote repository</a></span></dt><dt><span class="section"><a href="#how-git-stores-references">Naming branches, tags, and other references</a></span></dt><dt><span class="section"><a href="#Updating-a-repository-With-git-fetch">Updating a repository with git fetch</a></span></dt><dt><span class="section"><a href="#fetching-branches">Fetching branches from other repositories</a></span></dt></dl></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="how-to-get-a-git-repository"></a>How to get a Git repository</h2></div></div></div><p>It will be useful to have a Git repository to experiment with as you
 read this manual.</p><p>The best way to get one is by using the <a class="ulink" href="git-clone.html" target="_top">git-clone(1)</a> command to
 download a copy of an existing repository.  If you don’t already have a
-project in mind, here are some interesting examples:</p><pre class="literallayout">        # Git itself (approx. 40MB download):
+project in mind, here are some interesting examples:</p><pre class="screen">        # Git itself (approx. 40MB download):
 $ git clone git://git.kernel.org/pub/scm/git/git.git
         # the Linux kernel (approx. 640MB download):
 $ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git</pre><p>The initial clone may be time-consuming for a large project, but you
@@ -30,12 +30,12 @@ parallel lines of development, called <a class="link" href="#def_branch">branche
 merge and diverge.</p><p>A single Git repository can track development on multiple branches.  It
 does this by keeping a list of <a class="link" href="#def_head">heads</a> which reference the
 latest commit on each branch; the <a class="ulink" href="git-branch.html" target="_top">git-branch(1)</a> command shows
-you the list of branch heads:</p><pre class="literallayout">$ git branch
+you the list of branch heads:</p><pre class="screen">$ git branch
 * master</pre><p>A freshly cloned repository contains a single branch head, by default
 named "master", with the working directory initialized to the state of
 the project referred to by that branch head.</p><p>Most projects also use <a class="link" href="#def_tag">tags</a>.  Tags, like heads, are
 references into the project’s history, and can be listed using the
-<a class="ulink" href="git-tag.html" target="_top">git-tag(1)</a> command:</p><pre class="literallayout">$ git tag -l
+<a class="ulink" href="git-tag.html" target="_top">git-tag(1)</a> command:</p><pre class="screen">$ git tag -l
 v2.6.11
 v2.6.11-tree
 v2.6.12
@@ -47,17 +47,17 @@ v2.6.12-rc6
 v2.6.13
 ...</pre><p>Tags are expected to always point at the same version of a project,
 while heads are expected to advance as development progresses.</p><p>Create a new branch head pointing to one of these versions and check it
-out using <a class="ulink" href="git-switch.html" target="_top">git-switch(1)</a>:</p><pre class="literallayout">$ git switch -c new v2.6.13</pre><p>The working directory then reflects the contents that the project had
+out using <a class="ulink" href="git-switch.html" target="_top">git-switch(1)</a>:</p><pre class="screen">$ git switch -c new v2.6.13</pre><p>The working directory then reflects the contents that the project had
 when it was tagged v2.6.13, and <a class="ulink" href="git-branch.html" target="_top">git-branch(1)</a> shows two
-branches, with an asterisk marking the currently checked-out branch:</p><pre class="literallayout">$ git branch
+branches, with an asterisk marking the currently checked-out branch:</p><pre class="screen">$ git branch
   master
 * new</pre><p>If you decide that you’d rather see version 2.6.17, you can modify
-the current branch to point at v2.6.17 instead, with</p><pre class="literallayout">$ git reset --hard v2.6.17</pre><p>Note that if the current branch head was your only reference to a
+the current branch to point at v2.6.17 instead, with</p><pre class="screen">$ git reset --hard v2.6.17</pre><p>Note that if the current branch head was your only reference to a
 particular point in history, then resetting that branch may leave you
 with no way to find the history it used to point to; so use this command
 carefully.</p></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="understanding-commits"></a>Understanding History: Commits</h2></div></div></div><p>Every change in the history of a project is represented by a commit.
 The <a class="ulink" href="git-show.html" target="_top">git-show(1)</a> command shows the most recent commit on the
-current branch:</p><pre class="literallayout">$ git show
+current branch:</p><pre class="screen">$ git show
 commit 17cf781661e6d38f737f15f53ab552f1e95960d7
 Author: Linus Torvalds &lt;torvalds@ppc970.osdl.org.(none)&gt;
 Date:   Tue Apr 19 14:11:06 2005 -0700
@@ -154,10 +154,10 @@ a summary of the commands:</p><div class="variablelist"><dl class="variablelist"
         check it out.
 </dd></dl></div><p>The special symbol "HEAD" can always be used to refer to the current
 branch.  In fact, Git uses a file named <code class="literal">HEAD</code> in the <code class="literal">.git</code> directory
-to remember which branch is current:</p><pre class="literallayout">$ cat .git/HEAD
+to remember which branch is current:</p><pre class="screen">$ cat .git/HEAD
 ref: refs/heads/master</pre></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="detached-head"></a>Examining an old version without creating a new branch</h2></div></div></div><p>The <code class="literal">git switch</code> command normally expects a branch head, but will also
 accept an arbitrary commit when invoked with --detach; for example,
-you can check out the commit referenced by a tag:</p><pre class="literallayout">$ git switch --detach v2.6.17
+you can check out the commit referenced by a tag:</p><pre class="screen">$ git switch --detach v2.6.17
 Note: checking out 'v2.6.17'.
 
 You are in 'detached HEAD' state. You can look around, make experimental
@@ -170,7 +170,7 @@ do so (now or later) by using -c with the switch command again. Example:
   git switch -c new_branch_name
 
 HEAD is now at 427abfa Linux v2.6.17</pre><p>The HEAD then refers to the SHA-1 of the commit instead of to a branch,
-and git branch shows that you are no longer on a branch:</p><pre class="literallayout">$ cat .git/HEAD
+and git branch shows that you are no longer on a branch:</p><pre class="screen">$ cat .git/HEAD
 427abfa28afedffadfca9dd8b067eb6d36bac53f
 $ git branch
 * (detached from v2.6.17)
@@ -181,7 +181,7 @@ of the HEAD in the repository that you cloned from.  That repository
 may also have had other branches, though, and your local repository
 keeps branches which track each of those remote branches, called
 remote-tracking branches, which you
-can view using the <code class="literal">-r</code> option to <a class="ulink" href="git-branch.html" target="_top">git-branch(1)</a>:</p><pre class="literallayout">$ git branch -r
+can view using the <code class="literal">-r</code> option to <a class="ulink" href="git-branch.html" target="_top">git-branch(1)</a>:</p><pre class="screen">$ git branch -r
   origin/HEAD
   origin/html
   origin/maint
@@ -195,7 +195,7 @@ branches" from our point of view. The remote-tracking branches listed
 above were created based on the remote branches at clone time and will
 be updated by <code class="literal">git fetch</code> (hence <code class="literal">git pull</code>) and <code class="literal">git push</code>. See
 <a class="xref" href="#Updating-a-repository-With-git-fetch" title="Updating a repository with git fetch">the section called “Updating a repository with git fetch”</a> for details.</p><p>You might want to build on one of these remote-tracking branches
-on a branch of your own, just as you would for a tag:</p><pre class="literallayout">$ git switch -c my-todo-copy origin/todo</pre><p>You can also check out <code class="literal">origin/todo</code> directly to examine it or
+on a branch of your own, just as you would for a tag:</p><pre class="screen">$ git switch -c my-todo-copy origin/todo</pre><p>You can also check out <code class="literal">origin/todo</code> directly to examine it or
 write a one-off patch.  See <a class="link" href="#detached-head" title="Examining an old version without creating a new branch">detached head</a>.</p><p>Note that the name "origin" is just the name that Git uses by default
 to refer to the repository that you cloned from.</p></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="how-git-stores-references"></a>Naming branches, tags, and other references</h2></div></div></div><p>Branches, remote-tracking branches, and tags are all references to
 commits.  All references are named with a slash-separated path name
@@ -220,21 +220,21 @@ may wish to check the original repository for updates.</p><p>The <code class="li
 remote-tracking branches to the latest version found in the original
 repository.  It will not touch any of your own branches—not even the
 "master" branch that was created for you on clone.</p></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="fetching-branches"></a>Fetching branches from other repositories</h2></div></div></div><p>You can also track branches from repositories other than the one you
-cloned from, using <a class="ulink" href="git-remote.html" target="_top">git-remote(1)</a>:</p><pre class="literallayout">$ git remote add staging git://git.kernel.org/.../gregkh/staging.git
+cloned from, using <a class="ulink" href="git-remote.html" target="_top">git-remote(1)</a>:</p><pre class="screen">$ git remote add staging git://git.kernel.org/.../gregkh/staging.git
 $ git fetch staging
 ...
 From git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
  * [new branch]      master     -&gt; staging/master
  * [new branch]      staging-linus -&gt; staging/staging-linus
  * [new branch]      staging-next -&gt; staging/staging-next</pre><p>New remote-tracking branches will be stored under the shorthand name
-that you gave <code class="literal">git remote add</code>, in this case <code class="literal">staging</code>:</p><pre class="literallayout">$ git branch -r
+that you gave <code class="literal">git remote add</code>, in this case <code class="literal">staging</code>:</p><pre class="screen">$ git branch -r
   origin/HEAD -&gt; origin/master
   origin/master
   staging/master
   staging/staging-linus
   staging/staging-next</pre><p>If you run <code class="literal">git fetch &lt;remote&gt;</code> later, the remote-tracking branches
 for the named <code class="literal">&lt;remote&gt;</code> will be updated.</p><p>If you examine the file <code class="literal">.git/config</code>, you will see that Git has added
-a new stanza:</p><pre class="literallayout">$ cat .git/config
+a new stanza:</p><pre class="screen">$ cat .git/config
 ...
 [remote "staging"]
         url = git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
@@ -251,7 +251,7 @@ commit that introduced a bug into a project.</p><div class="section"><div class=
 "master" crashes.  Sometimes the best way to find the cause of such a
 regression is to perform a brute-force search through the project’s
 history to find the particular commit that caused the problem.  The
-<a class="ulink" href="git-bisect.html" target="_top">git-bisect(1)</a> command can help you do this:</p><pre class="literallayout">$ git bisect start
+<a class="ulink" href="git-bisect.html" target="_top">git-bisect(1)</a> command can help you do this:</p><pre class="screen">$ git bisect start
 $ git bisect good v2.6.18
 $ git bisect bad master
 Bisecting: 3537 revisions left to test after this
@@ -259,7 +259,7 @@ Bisecting: 3537 revisions left to test after this
 temporarily moved you in "(no branch)". HEAD is now detached from any
 branch and points directly to a commit (with commit id 65934) that
 is reachable from "master" but not from v2.6.18. Compile and test it,
-and see whether it crashes. Assume it does crash. Then:</p><pre class="literallayout">$ git bisect bad
+and see whether it crashes. Assume it does crash. Then:</p><pre class="screen">$ git bisect bad
 Bisecting: 1769 revisions left to test after this
 [7eff82c8b1511017ae605f0c99ac275a7e21b867] i2c-core: Drop useless bitmaskings</pre><p>checks out an older version.  Continue like this, telling Git at each
 stage whether the version it gives you is good or bad, and notice
@@ -267,16 +267,16 @@ that the number of revisions left to test is cut approximately in
 half each time.</p><p>After about 13 tests (in this case), it will output the commit id of
 the guilty commit.  You can then examine the commit with
 <a class="ulink" href="git-show.html" target="_top">git-show(1)</a>, find out who wrote it, and mail them your bug
-report with the commit id.  Finally, run</p><pre class="literallayout">$ git bisect reset</pre><p>to return you to the branch you were on before.</p><p>Note that the version which <code class="literal">git bisect</code> checks out for you at each
+report with the commit id.  Finally, run</p><pre class="screen">$ git bisect reset</pre><p>to return you to the branch you were on before.</p><p>Note that the version which <code class="literal">git bisect</code> checks out for you at each
 point is just a suggestion, and you’re free to try a different
 version if you think it would be a good idea.  For example,
 occasionally you may land on a commit that broke something unrelated;
-run</p><pre class="literallayout">$ git bisect visualize</pre><p>which will run gitk and label the commit it chose with a marker that
+run</p><pre class="screen">$ git bisect visualize</pre><p>which will run gitk and label the commit it chose with a marker that
 says "bisect".  Choose a safe-looking commit nearby, note its commit
-id, and check it out with:</p><pre class="literallayout">$ git reset --hard fb47ddb2db</pre><p>then test, run <code class="literal">bisect good</code> or <code class="literal">bisect bad</code> as appropriate, and
+id, and check it out with:</p><pre class="screen">$ git reset --hard fb47ddb2db</pre><p>then test, run <code class="literal">bisect good</code> or <code class="literal">bisect bad</code> as appropriate, and
 continue.</p><p>Instead of <code class="literal">git bisect visualize</code> and then <code class="literal">git reset --hard
 fb47ddb2db</code>, you might just want to tell Git that you want to skip
-the current commit:</p><pre class="literallayout">$ git bisect skip</pre><p>In this case, though, Git may not eventually be able to tell the first
+the current commit:</p><pre class="screen">$ git bisect skip</pre><p>In this case, though, Git may not eventually be able to tell the first
 bad one between some first skipped commits and a later bad commit.</p><p>There are also ways to automate the bisecting process if you have a
 test script that can tell a good from a bad commit. See
 <a class="ulink" href="git-bisect.html" target="_top">git-bisect(1)</a> for more information about this and other <code class="literal">git
@@ -293,30 +293,30 @@ tag name: refers to the commit pointed to by the given tag
 HEAD: refers to the head of the current branch
 </li></ul></div><p>There are many more; see the "SPECIFYING REVISIONS" section of the
 <a class="ulink" href="gitrevisions.html" target="_top">gitrevisions(7)</a> man page for the complete list of ways to
-name revisions.  Some examples:</p><pre class="literallayout">$ git show fb47ddb2 # the first few characters of the object name
+name revisions.  Some examples:</p><pre class="screen">$ git show fb47ddb2 # the first few characters of the object name
                     # are usually enough to specify it uniquely
 $ git show HEAD^    # the parent of the HEAD commit
 $ git show HEAD^^   # the grandparent
 $ git show HEAD~4   # the great-great-grandparent</pre><p>Recall that merge commits may have more than one parent; by default,
 <code class="literal">^</code> and <code class="literal">~</code> follow the first parent listed in the commit, but you can
-also choose:</p><pre class="literallayout">$ git show HEAD^1   # show the first parent of HEAD
+also choose:</p><pre class="screen">$ git show HEAD^1   # show the first parent of HEAD
 $ git show HEAD^2   # show the second parent of HEAD</pre><p>In addition to HEAD, there are several other special names for
 commits:</p><p>Merges (to be discussed later), as well as operations such as
 <code class="literal">git reset</code>, which change the currently checked-out commit, generally
 set ORIG_HEAD to the value HEAD had before the current operation.</p><p>The <code class="literal">git fetch</code> operation always stores the head of the last fetched
 branch in FETCH_HEAD.  For example, if you run <code class="literal">git fetch</code> without
-specifying a local branch as the target of the operation</p><pre class="literallayout">$ git fetch git://example.com/proj.git theirbranch</pre><p>the fetched commits will still be available from FETCH_HEAD.</p><p>When we discuss merges we’ll also see the special name MERGE_HEAD,
+specifying a local branch as the target of the operation</p><pre class="screen">$ git fetch git://example.com/proj.git theirbranch</pre><p>the fetched commits will still be available from FETCH_HEAD.</p><p>When we discuss merges we’ll also see the special name MERGE_HEAD,
 which refers to the other branch that we’re merging in to the current
 branch.</p><p>The <a class="ulink" href="git-rev-parse.html" target="_top">git-rev-parse(1)</a> command is a low-level command that is
 occasionally useful for translating some name for a commit to the object
-name for that commit:</p><pre class="literallayout">$ git rev-parse origin
+name for that commit:</p><pre class="screen">$ git rev-parse origin
 e05db0fd4f31dde7005f075a84f96b360d05984b</pre></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="creating-tags"></a>Creating tags</h2></div></div></div><p>We can also create a tag to refer to a particular commit; after
-running</p><pre class="literallayout">$ git tag stable-1 1b2e1d63ff</pre><p>You can use <code class="literal">stable-1</code> to refer to the commit 1b2e1d63ff.</p><p>This creates a "lightweight" tag.  If you would also like to include a
+running</p><pre class="screen">$ git tag stable-1 1b2e1d63ff</pre><p>You can use <code class="literal">stable-1</code> to refer to the commit 1b2e1d63ff.</p><p>This creates a "lightweight" tag.  If you would also like to include a
 comment with the tag, and possibly sign it cryptographically, then you
 should create a tag object instead; see the <a class="ulink" href="git-tag.html" target="_top">git-tag(1)</a> man page
 for details.</p></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="browsing-revisions"></a>Browsing revisions</h2></div></div></div><p>The <a class="ulink" href="git-log.html" target="_top">git-log(1)</a> command can show lists of commits.  On its
 own, it shows all commits reachable from the parent commit; but you
-can also make more specific requests:</p><pre class="literallayout">$ git log v2.5..        # commits since (not reachable from) v2.5
+can also make more specific requests:</p><pre class="screen">$ git log v2.5..        # commits since (not reachable from) v2.5
 $ git log test..master  # commits reachable from master but not test
 $ git log master..test  # ...reachable from test but not master
 $ git log master...test # ...reachable from either test or master,
@@ -326,83 +326,83 @@ $ git log Makefile      # commits which modify Makefile
 $ git log fs/           # ... which modify any file under fs/
 $ git log -S'foo()'     # commits which add or remove any file data
                         # matching the string 'foo()'</pre><p>And of course you can combine all of these; the following finds
-commits since v2.5 which touch the <code class="literal">Makefile</code> or any file under <code class="literal">fs</code>:</p><pre class="literallayout">$ git log v2.5.. Makefile fs/</pre><p>You can also ask git log to show patches:</p><pre class="literallayout">$ git log -p</pre><p>See the <code class="literal">--pretty</code> option in the <a class="ulink" href="git-log.html" target="_top">git-log(1)</a> man page for more
+commits since v2.5 which touch the <code class="literal">Makefile</code> or any file under <code class="literal">fs</code>:</p><pre class="screen">$ git log v2.5.. Makefile fs/</pre><p>You can also ask git log to show patches:</p><pre class="screen">$ git log -p</pre><p>See the <code class="literal">--pretty</code> option in the <a class="ulink" href="git-log.html" target="_top">git-log(1)</a> man page for more
 display options.</p><p>Note that git log starts with the most recent commit and works
 backwards through the parents; however, since Git history can contain
 multiple independent lines of development, the particular order that
 commits are listed in may be somewhat arbitrary.</p></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="generating-diffs"></a>Generating diffs</h2></div></div></div><p>You can generate diffs between any two versions using
-<a class="ulink" href="git-diff.html" target="_top">git-diff(1)</a>:</p><pre class="literallayout">$ git diff master..test</pre><p>That will produce the diff between the tips of the two branches.  If
+<a class="ulink" href="git-diff.html" target="_top">git-diff(1)</a>:</p><pre class="screen">$ git diff master..test</pre><p>That will produce the diff between the tips of the two branches.  If
 you’d prefer to find the diff from their common ancestor to test, you
-can use three dots instead of two:</p><pre class="literallayout">$ git diff master...test</pre><p>Sometimes what you want instead is a set of patches; for this you can
-use <a class="ulink" href="git-format-patch.html" target="_top">git-format-patch(1)</a>:</p><pre class="literallayout">$ git format-patch master..test</pre><p>will generate a file with a patch for each commit reachable from test
+can use three dots instead of two:</p><pre class="screen">$ git diff master...test</pre><p>Sometimes what you want instead is a set of patches; for this you can
+use <a class="ulink" href="git-format-patch.html" target="_top">git-format-patch(1)</a>:</p><pre class="screen">$ git format-patch master..test</pre><p>will generate a file with a patch for each commit reachable from test
 but not from master.</p></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="viewing-old-file-versions"></a>Viewing old file versions</h2></div></div></div><p>You can always view an old version of a file by just checking out the
 correct revision first.  But sometimes it is more convenient to be
 able to view an old version of a single file without checking
-anything out; this command does that:</p><pre class="literallayout">$ git show v2.5:fs/locks.c</pre><p>Before the colon may be anything that names a commit, and after it
+anything out; this command does that:</p><pre class="screen">$ git show v2.5:fs/locks.c</pre><p>Before the colon may be anything that names a commit, and after it
 may be any path to a file tracked by Git.</p></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="history-examples"></a>Examples</h2></div></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="counting-commits-on-a-branch"></a>Counting the number of commits on a branch</h3></div></div></div><p>Suppose you want to know how many commits you’ve made on <code class="literal">mybranch</code>
-since it diverged from <code class="literal">origin</code>:</p><pre class="literallayout">$ git log --pretty=oneline origin..mybranch | wc -l</pre><p>Alternatively, you may often see this sort of thing done with the
+since it diverged from <code class="literal">origin</code>:</p><pre class="screen">$ git log --pretty=oneline origin..mybranch | wc -l</pre><p>Alternatively, you may often see this sort of thing done with the
 lower-level command <a class="ulink" href="git-rev-list.html" target="_top">git-rev-list(1)</a>, which just lists the SHA-1’s
-of all the given commits:</p><pre class="literallayout">$ git rev-list origin..mybranch | wc -l</pre></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="checking-for-equal-branches"></a>Check whether two branches point at the same history</h3></div></div></div><p>Suppose you want to check whether two branches point at the same point
-in history.</p><pre class="literallayout">$ git diff origin..master</pre><p>will tell you whether the contents of the project are the same at the
+of all the given commits:</p><pre class="screen">$ git rev-list origin..mybranch | wc -l</pre></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="checking-for-equal-branches"></a>Check whether two branches point at the same history</h3></div></div></div><p>Suppose you want to check whether two branches point at the same point
+in history.</p><pre class="screen">$ git diff origin..master</pre><p>will tell you whether the contents of the project are the same at the
 two branches; in theory, however, it’s possible that the same project
 contents could have been arrived at by two different historical
-routes.  You could compare the object names:</p><pre class="literallayout">$ git rev-list origin
+routes.  You could compare the object names:</p><pre class="screen">$ git rev-list origin
 e05db0fd4f31dde7005f075a84f96b360d05984b
 $ git rev-list master
 e05db0fd4f31dde7005f075a84f96b360d05984b</pre><p>Or you could recall that the <code class="literal">...</code> operator selects all commits
 reachable from either one reference or the other but not
-both; so</p><pre class="literallayout">$ git log origin...master</pre><p>will return no commits when the two branches are equal.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="finding-tagged-descendants"></a>Find first tagged version including a given fix</h3></div></div></div><p>Suppose you know that the commit e05db0fd fixed a certain problem.
+both; so</p><pre class="screen">$ git log origin...master</pre><p>will return no commits when the two branches are equal.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="finding-tagged-descendants"></a>Find first tagged version including a given fix</h3></div></div></div><p>Suppose you know that the commit e05db0fd fixed a certain problem.
 You’d like to find the earliest tagged release that contains that
 fix.</p><p>Of course, there may be more than one answer—if the history branched
 after commit e05db0fd, then there could be multiple "earliest" tagged
-releases.</p><p>You could just visually inspect the commits since e05db0fd:</p><pre class="literallayout">$ gitk e05db0fd..</pre><p>or you can use <a class="ulink" href="git-name-rev.html" target="_top">git-name-rev(1)</a>, which will give the commit a
+releases.</p><p>You could just visually inspect the commits since e05db0fd:</p><pre class="screen">$ gitk e05db0fd..</pre><p>or you can use <a class="ulink" href="git-name-rev.html" target="_top">git-name-rev(1)</a>, which will give the commit a
 name based on any tag it finds pointing to one of the commit’s
-descendants:</p><pre class="literallayout">$ git name-rev --tags e05db0fd
+descendants:</p><pre class="screen">$ git name-rev --tags e05db0fd
 e05db0fd tags/v1.5.0-rc1^0~23</pre><p>The <a class="ulink" href="git-describe.html" target="_top">git-describe(1)</a> command does the opposite, naming the
-revision using a tag on which the given commit is based:</p><pre class="literallayout">$ git describe e05db0fd
+revision using a tag on which the given commit is based:</p><pre class="screen">$ git describe e05db0fd
 v1.5.0-rc0-260-ge05db0f</pre><p>but that may sometimes help you guess which tags might come after the
 given commit.</p><p>If you just want to verify whether a given tagged version contains a
-given commit, you could use <a class="ulink" href="git-merge-base.html" target="_top">git-merge-base(1)</a>:</p><pre class="literallayout">$ git merge-base e05db0fd v1.5.0-rc1
+given commit, you could use <a class="ulink" href="git-merge-base.html" target="_top">git-merge-base(1)</a>:</p><pre class="screen">$ git merge-base e05db0fd v1.5.0-rc1
 e05db0fd4f31dde7005f075a84f96b360d05984b</pre><p>The merge-base command finds a common ancestor of the given commits,
 and always returns one or the other in the case where one is a
 descendant of the other; so the above output shows that e05db0fd
-actually is an ancestor of v1.5.0-rc1.</p><p>Alternatively, note that</p><pre class="literallayout">$ git log v1.5.0-rc1..e05db0fd</pre><p>will produce empty output if and only if v1.5.0-rc1 includes e05db0fd,
+actually is an ancestor of v1.5.0-rc1.</p><p>Alternatively, note that</p><pre class="screen">$ git log v1.5.0-rc1..e05db0fd</pre><p>will produce empty output if and only if v1.5.0-rc1 includes e05db0fd,
 because it outputs only commits that are not reachable from v1.5.0-rc1.</p><p>As yet another alternative, the <a class="ulink" href="git-show-branch.html" target="_top">git-show-branch(1)</a> command lists
 the commits reachable from its arguments with a display on the left-hand
 side that indicates which arguments that commit is reachable from.
-So, if you run something like</p><pre class="literallayout">$ git show-branch e05db0fd v1.5.0-rc0 v1.5.0-rc1 v1.5.0-rc2
+So, if you run something like</p><pre class="screen">$ git show-branch e05db0fd v1.5.0-rc0 v1.5.0-rc1 v1.5.0-rc2
 ! [e05db0fd] Fix warnings in sha1_file.c - use C99 printf format if
 available
  ! [v1.5.0-rc0] GIT v1.5.0 preview
   ! [v1.5.0-rc1] GIT v1.5.0-rc1
    ! [v1.5.0-rc2] GIT v1.5.0-rc2
-...</pre><p>then a line like</p><pre class="literallayout">+ ++ [e05db0fd] Fix warnings in sha1_file.c - use C99 printf format if
+...</pre><p>then a line like</p><pre class="screen">+ ++ [e05db0fd] Fix warnings in sha1_file.c - use C99 printf format if
 available</pre><p>shows that e05db0fd is reachable from itself, from v1.5.0-rc1,
 and from v1.5.0-rc2, and not from v1.5.0-rc0.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="showing-commits-unique-to-a-branch"></a>Showing commits unique to a given branch</h3></div></div></div><p>Suppose you would like to see all the commits reachable from the branch
 head named <code class="literal">master</code> but not from any other head in your repository.</p><p>We can list all the heads in this repository with
-<a class="ulink" href="git-show-ref.html" target="_top">git-show-ref(1)</a>:</p><pre class="literallayout">$ git show-ref --heads
+<a class="ulink" href="git-show-ref.html" target="_top">git-show-ref(1)</a>:</p><pre class="screen">$ git show-ref --heads
 bf62196b5e363d73353a9dcf094c59595f3153b7 refs/heads/core-tutorial
 db768d5504c1bb46f63ee9d6e1772bd047e05bf9 refs/heads/maint
 a07157ac624b2524a059a3414e99f6f44bebc1e7 refs/heads/master
 24dbc180ea14dc1aebe09f14c8ecf32010690627 refs/heads/tutorial-2
 1e87486ae06626c2f31eaa63d26fc0fd646c8af2 refs/heads/tutorial-fixes</pre><p>We can get just the branch-head names, and remove <code class="literal">master</code>, with
-the help of the standard utilities cut and grep:</p><pre class="literallayout">$ git show-ref --heads | cut -d' ' -f2 | grep -v '^refs/heads/master'
+the help of the standard utilities cut and grep:</p><pre class="screen">$ git show-ref --heads | cut -d' ' -f2 | grep -v '^refs/heads/master'
 refs/heads/core-tutorial
 refs/heads/maint
 refs/heads/tutorial-2
 refs/heads/tutorial-fixes</pre><p>And then we can ask to see all the commits reachable from master
-but not from these other heads:</p><pre class="literallayout">$ gitk master --not $( git show-ref --heads | cut -d' ' -f2 |
+but not from these other heads:</p><pre class="screen">$ gitk master --not $( git show-ref --heads | cut -d' ' -f2 |
                                 grep -v '^refs/heads/master' )</pre><p>Obviously, endless variations are possible; for example, to see all
-commits reachable from some head but not from any tag in the repository:</p><pre class="literallayout">$ gitk $( git show-ref --heads ) --not  $( git show-ref --tags )</pre><p>(See <a class="ulink" href="gitrevisions.html" target="_top">gitrevisions(7)</a> for explanations of commit-selecting
+commits reachable from some head but not from any tag in the repository:</p><pre class="screen">$ gitk $( git show-ref --heads ) --not  $( git show-ref --tags )</pre><p>(See <a class="ulink" href="gitrevisions.html" target="_top">gitrevisions(7)</a> for explanations of commit-selecting
 syntax such as <code class="literal">--not</code>.)</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="making-a-release"></a>Creating a changelog and tarball for a software release</h3></div></div></div><p>The <a class="ulink" href="git-archive.html" target="_top">git-archive(1)</a> command can create a tar or zip archive from
-any version of a project; for example:</p><pre class="literallayout">$ git archive -o latest.tar.gz --prefix=project/ HEAD</pre><p>will use HEAD to produce a gzipped tar archive in which each filename
+any version of a project; for example:</p><pre class="screen">$ git archive -o latest.tar.gz --prefix=project/ HEAD</pre><p>will use HEAD to produce a gzipped tar archive in which each filename
 is preceded by <code class="literal">project/</code>.  The output file format is inferred from
 the output file extension if possible, see <a class="ulink" href="git-archive.html" target="_top">git-archive(1)</a> for
 details.</p><p>Versions of Git older than 1.7.7 don’t know about the <code class="literal">tar.gz</code> format,
-you’ll need to use gzip explicitly:</p><pre class="literallayout">$ git archive --format=tar --prefix=project/ HEAD | gzip &gt;latest.tar.gz</pre><p>If you’re releasing a new version of a software project, you may want
+you’ll need to use gzip explicitly:</p><pre class="screen">$ git archive --format=tar --prefix=project/ HEAD | gzip &gt;latest.tar.gz</pre><p>If you’re releasing a new version of a software project, you may want
 to simultaneously make a changelog to include in the release
 announcement.</p><p>Linus Torvalds, for example, makes new kernel releases by tagging them,
-then running:</p><pre class="literallayout">$ release-script 2.6.12 2.6.13-rc6 2.6.13-rc7</pre><p>where release-script is a shell script that looks like:</p><pre class="literallayout">#!/bin/sh
+then running:</p><pre class="screen">$ release-script 2.6.12 2.6.13-rc6 2.6.13-rc7</pre><p>where release-script is a shell script that looks like:</p><pre class="screen">#!/bin/sh
 stable="$1"
 last="$2"
 new="$3"
@@ -414,19 +414,19 @@ echo "git shortlog --no-merges v$new ^v$last &gt; ../ShortLog"
 echo "git diff --stat --summary -M v$last v$new &gt; ../diffstat-$new"</pre><p>and then he just cut-and-pastes the output commands after verifying that
 they look OK.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="Finding-commits-With-given-Content"></a>Finding commits referencing a file with given content</h3></div></div></div><p>Somebody hands you a copy of a file, and asks which commits modified a
 file such that it contained the given content either before or after the
-commit.  You can find out with this:</p><pre class="literallayout">$  git log --raw --abbrev=40 --pretty=oneline |
+commit.  You can find out with this:</p><pre class="screen">$  git log --raw --abbrev=40 --pretty=oneline |
         grep -B 1 `git hash-object filename`</pre><p>Figuring out why this works is left as an exercise to the (advanced)
 student.  The <a class="ulink" href="git-log.html" target="_top">git-log(1)</a>, <a class="ulink" href="git-diff-tree.html" target="_top">git-diff-tree(1)</a>, and
 <a class="ulink" href="git-hash-object.html" target="_top">git-hash-object(1)</a> man pages may prove helpful.</p></div></div></div><div class="chapter"><div class="titlepage"><div><div><h1 class="title"><a name="Developing-With-git"></a>Chapter 3. Developing with Git</h1></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl class="toc"><dt><span class="section"><a href="#telling-git-your-name">Telling Git your name</a></span></dt><dt><span class="section"><a href="#creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#how-to-make-a-commit">How to make a commit</a></span></dt><dt><span class="section"><a href="#creating-good-commit-messages">Creating good commit messages</a></span></dt><dt><span class="section"><a href="#ignoring-files">Ignoring files</a></span></dt><dt><span class="section"><a href="#how-to-merge">How to merge</a></span></dt><dt><span class="section"><a href="#resolving-a-merge">Resolving a merge</a></span></dt><dd><dl><dt><span class="section"><a href="#conflict-resolution">Getting conflict-resolution help during a merge</a></span></dt></dl></dd><dt><span class="section"><a href="#undoing-a-merge">Undoing a merge</a></span></dt><dt><span class="section"><a href="#fast-forwards">Fast-forward merges</a></span></dt><dt><span class="section"><a href="#fixing-mistakes">Fixing mistakes</a></span></dt><dd><dl><dt><span class="section"><a href="#reverting-a-commit">Fixing a mistake with a new commit</a></span></dt><dt><span class="section"><a href="#fixing-a-mistake-by-rewriting-history">Fixing a mistake by rewriting history</a></span></dt><dt><span class="section"><a href="#checkout-of-path">Checking out an old version of a file</a></span></dt><dt><span class="section"><a href="#interrupted-work">Temporarily setting aside work in progress</a></span></dt></dl></dd><dt><span class="section"><a href="#ensuring-good-performance">Ensuring good performance</a></span></dt><dt><span class="section"><a href="#ensuring-reliability">Ensuring reliability</a></span></dt><dd><dl><dt><span class="section"><a href="#checking-for-corruption">Checking the repository for corruption</a></span></dt><dt><span class="section"><a href="#recovering-lost-changes">Recovering lost changes</a></span></dt></dl></dd></dl></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="telling-git-your-name"></a>Telling Git your name</h2></div></div></div><p>Before creating any commits, you should introduce yourself to Git.
-The easiest way to do so is to use <a class="ulink" href="git-config.html" target="_top">git-config(1)</a>:</p><pre class="literallayout">$ git config --global user.name 'Your Name Comes Here'
+The easiest way to do so is to use <a class="ulink" href="git-config.html" target="_top">git-config(1)</a>:</p><pre class="screen">$ git config --global user.name 'Your Name Comes Here'
 $ git config --global user.email 'you@yourdomain.example.com'</pre><p>Which will add the following to a file named <code class="literal">.gitconfig</code> in your
-home directory:</p><pre class="literallayout">[user]
+home directory:</p><pre class="screen">[user]
         name = Your Name Comes Here
         email = you@yourdomain.example.com</pre><p>See the "CONFIGURATION FILE" section of <a class="ulink" href="git-config.html" target="_top">git-config(1)</a> for
 details on the configuration file.  The file is plain text, so you can
-also edit it with your favorite editor.</p></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="creating-a-new-repository"></a>Creating a new repository</h2></div></div></div><p>Creating a new repository from scratch is very easy:</p><pre class="literallayout">$ mkdir project
+also edit it with your favorite editor.</p></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="creating-a-new-repository"></a>Creating a new repository</h2></div></div></div><p>Creating a new repository from scratch is very easy:</p><pre class="screen">$ mkdir project
 $ cd project
-$ git init</pre><p>If you have some initial content (say, a tarball):</p><pre class="literallayout">$ tar xzvf project.tar.gz
+$ git init</pre><p>If you have some initial content (say, a tarball):</p><pre class="screen">$ tar xzvf project.tar.gz
 $ cd project
 $ git init
 $ git add . # include everything below ./ in the first commit:
@@ -444,13 +444,13 @@ at step 3, Git maintains a snapshot of the tree’s contents in a
 special staging area called "the index."</p><p>At the beginning, the content of the index will be identical to
 that of the HEAD.  The command <code class="literal">git diff --cached</code>, which shows
 the difference between the HEAD and the index, should therefore
-produce no output at that point.</p><p>Modifying the index is easy:</p><p>To update the index with the contents of a new or modified file, use</p><pre class="literallayout">$ git add path/to/file</pre><p>To remove a file from the index and from the working tree, use</p><pre class="literallayout">$ git rm path/to/file</pre><p>After each step you can verify that</p><pre class="literallayout">$ git diff --cached</pre><p>always shows the difference between the HEAD and the index file—this
-is what you’d commit if you created the commit now—and that</p><pre class="literallayout">$ git diff</pre><p>shows the difference between the working tree and the index file.</p><p>Note that <code class="literal">git add</code> always adds just the current contents of a file
+produce no output at that point.</p><p>Modifying the index is easy:</p><p>To update the index with the contents of a new or modified file, use</p><pre class="screen">$ git add path/to/file</pre><p>To remove a file from the index and from the working tree, use</p><pre class="screen">$ git rm path/to/file</pre><p>After each step you can verify that</p><pre class="screen">$ git diff --cached</pre><p>always shows the difference between the HEAD and the index file—this
+is what you’d commit if you created the commit now—and that</p><pre class="screen">$ git diff</pre><p>shows the difference between the working tree and the index file.</p><p>Note that <code class="literal">git add</code> always adds just the current contents of a file
 to the index; further changes to the same file will be ignored unless
-you run <code class="literal">git add</code> on the file again.</p><p>When you’re ready, just run</p><pre class="literallayout">$ git commit</pre><p>and Git will prompt you for a commit message and then create the new
-commit.  Check to make sure it looks like what you expected with</p><pre class="literallayout">$ git show</pre><p>As a special shortcut,</p><pre class="literallayout">$ git commit -a</pre><p>will update the index with any files that you’ve modified or removed
+you run <code class="literal">git add</code> on the file again.</p><p>When you’re ready, just run</p><pre class="screen">$ git commit</pre><p>and Git will prompt you for a commit message and then create the new
+commit.  Check to make sure it looks like what you expected with</p><pre class="screen">$ git show</pre><p>As a special shortcut,</p><pre class="screen">$ git commit -a</pre><p>will update the index with any files that you’ve modified or removed
 and create a commit, all in one step.</p><p>A number of commands are useful for keeping track of what you’re
-about to commit:</p><pre class="literallayout">$ git diff --cached # difference between HEAD and the index; what
+about to commit:</p><pre class="screen">$ git diff --cached # difference between HEAD and the index; what
                     # would be committed if you ran "commit" now.
 $ git diff          # difference between the index file and your
                     # working directory; changes that would not
@@ -475,7 +475,7 @@ annoying to have these untracked files lying around; e.g. they make
 <code class="literal">git add .</code> practically useless, and they keep showing up in the output of
 <code class="literal">git status</code>.</p><p>You can tell Git to ignore certain files by creating a file called
 <code class="literal">.gitignore</code> in the top level of your working directory, with contents
-such as:</p><pre class="literallayout"># Lines starting with '#' are considered comments.
+such as:</p><pre class="screen"># Lines starting with '#' are considered comments.
 # Ignore any file named foo.txt.
 foo.txt
 # Ignore (generated) html files,
@@ -495,7 +495,7 @@ them in a file in your repository named <code class="literal">.git/info/exclude<
 file specified by the <code class="literal">core.excludesFile</code> configuration variable.
 Some Git commands can also take exclude patterns directly on the
 command line.  See <a class="ulink" href="gitignore.html" target="_top">gitignore(5)</a> for the details.</p></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="how-to-merge"></a>How to merge</h2></div></div></div><p>You can rejoin two diverging branches of development using
-<a class="ulink" href="git-merge.html" target="_top">git-merge(1)</a>:</p><pre class="literallayout">$ git merge branchname</pre><p>merges the development in the branch <code class="literal">branchname</code> into the current
+<a class="ulink" href="git-merge.html" target="_top">git-merge(1)</a>:</p><pre class="screen">$ git merge branchname</pre><p>merges the development in the branch <code class="literal">branchname</code> into the current
 branch.</p><p>A merge is made by combining the changes made in <code class="literal">branchname</code> and the
 changes made up to the latest commit in your current branch since
 their histories forked. The work tree is overwritten by the result of
@@ -510,7 +510,7 @@ the merge and commit the result (or reuse an existing commit in case
 of <a class="link" href="#fast-forwards" title="Fast-forward merges">fast-forward</a>, see below). On the other hand,
 if there are conflicts—for example, if the same file is
 modified in two different ways in the remote branch and the local
-branch—then you are warned; the output may look something like this:</p><pre class="literallayout">$ git merge next
+branch—then you are warned; the output may look something like this:</p><pre class="screen">$ git merge next
  100% (4/4) done
 Auto-merged file.txt
 CONFLICT (content): Merge conflict in file.txt
@@ -523,20 +523,20 @@ one to the top of the other branch.</p></div><div class="section"><div class="ti
 the working tree in a special state that gives you all the
 information you need to help resolve the merge.</p><p>Files with conflicts are marked specially in the index, so until you
 resolve the problem and update the index, <a class="ulink" href="git-commit.html" target="_top">git-commit(1)</a> will
-fail:</p><pre class="literallayout">$ git commit
+fail:</p><pre class="screen">$ git commit
 file.txt: needs merge</pre><p>Also, <a class="ulink" href="git-status.html" target="_top">git-status(1)</a> will list those files as "unmerged", and the
-files with conflicts will have conflict markers added, like this:</p><pre class="literallayout">&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD:file.txt
+files with conflicts will have conflict markers added, like this:</p><pre class="screen">&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD:file.txt
 Hello world
 =======
 Goodbye
-&gt;&gt;&gt;&gt;&gt;&gt;&gt; 77976da35a11db4580b80ae27e8d65caf5208086:file.txt</pre><p>All you need to do is edit the files to resolve the conflicts, and then</p><pre class="literallayout">$ git add file.txt
+&gt;&gt;&gt;&gt;&gt;&gt;&gt; 77976da35a11db4580b80ae27e8d65caf5208086:file.txt</pre><p>All you need to do is edit the files to resolve the conflicts, and then</p><pre class="screen">$ git add file.txt
 $ git commit</pre><p>Note that the commit message will already be filled in for you with
 some information about the merge.  Normally you can just use this
 default message unchanged, but you may add additional commentary of
 your own if desired.</p><p>The above is all you need to know to resolve a simple merge.  But Git
 also provides more information to help resolve conflicts:</p><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="conflict-resolution"></a>Getting conflict-resolution help during a merge</h3></div></div></div><p>All of the changes that Git was able to merge automatically are
 already added to the index file, so <a class="ulink" href="git-diff.html" target="_top">git-diff(1)</a> shows only
-the conflicts.  It uses an unusual syntax:</p><pre class="literallayout">$ git diff
+the conflicts.  It uses an unusual syntax:</p><pre class="screen">$ git diff
 diff --cc file.txt
 index 802992c,2b60207..0000000
 --- a/file.txt
@@ -550,7 +550,7 @@ index 802992c,2b60207..0000000
 conflict will have two parents instead of the usual one: one parent
 will be HEAD, the tip of the current branch; the other will be the
 tip of the other branch, which is stored temporarily in MERGE_HEAD.</p><p>During the merge, the index holds three versions of each file.  Each of
-these three "file stages" represents a different version of the file:</p><pre class="literallayout">$ git show :1:file.txt  # the file in a common ancestor of both branches
+these three "file stages" represents a different version of the file:</p><pre class="screen">$ git show :1:file.txt  # the file in a common ancestor of both branches
 $ git show :2:file.txt  # the version from HEAD.
 $ git show :3:file.txt  # the version from MERGE_HEAD.</pre><p>When you ask <a class="ulink" href="git-diff.html" target="_top">git-diff(1)</a> to show the conflicts, it runs a
 three-way diff between the conflicted merge results in the work tree with
@@ -563,7 +563,7 @@ column is used for differences between the first parent and the working
 directory copy, and the second for differences between the second parent
 and the working directory copy.  (See the "COMBINED DIFF FORMAT" section
 of <a class="ulink" href="git-diff-files.html" target="_top">git-diff-files(1)</a> for a details of the format.)</p><p>After resolving the conflict in the obvious way (but before updating the
-index), the diff will look like:</p><pre class="literallayout">$ git diff
+index), the diff will look like:</p><pre class="screen">$ git diff
 diff --cc file.txt
 index 802992c,2b60207..0000000
 --- a/file.txt
@@ -574,18 +574,18 @@ index 802992c,2b60207..0000000
 ++Goodbye world</pre><p>This shows that our resolved version deleted "Hello world" from the
 first parent, deleted "Goodbye" from the second parent, and added
 "Goodbye world", which was previously absent from both.</p><p>Some special diff options allow diffing the working directory against
-any of these stages:</p><pre class="literallayout">$ git diff -1 file.txt          # diff against stage 1
+any of these stages:</p><pre class="screen">$ git diff -1 file.txt          # diff against stage 1
 $ git diff --base file.txt      # same as the above
 $ git diff -2 file.txt          # diff against stage 2
 $ git diff --ours file.txt      # same as the above
 $ git diff -3 file.txt          # diff against stage 3
 $ git diff --theirs file.txt    # same as the above.</pre><p>The <a class="ulink" href="git-log.html" target="_top">git-log(1)</a> and <a class="ulink" href="gitk.html" target="_top">gitk(1)</a> commands also provide special help
-for merges:</p><pre class="literallayout">$ git log --merge
+for merges:</p><pre class="screen">$ git log --merge
 $ gitk --merge</pre><p>These will display all commits which exist only on HEAD or on
 MERGE_HEAD, and which touch an unmerged file.</p><p>You may also use <a class="ulink" href="git-mergetool.html" target="_top">git-mergetool(1)</a>, which lets you merge the
-unmerged files using external tools such as Emacs or kdiff3.</p><p>Each time you resolve the conflicts in a file and update the index:</p><pre class="literallayout">$ git add file.txt</pre><p>the different stages of that file will be "collapsed", after which
+unmerged files using external tools such as Emacs or kdiff3.</p><p>Each time you resolve the conflicts in a file and update the index:</p><pre class="screen">$ git add file.txt</pre><p>the different stages of that file will be "collapsed", after which
 <code class="literal">git diff</code> will (by default) no longer show diffs for that file.</p></div></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="undoing-a-merge"></a>Undoing a merge</h2></div></div></div><p>If you get stuck and decide to just give up and throw the whole mess
-away, you can always return to the pre-merge state with</p><pre class="literallayout">$ git merge --abort</pre><p>Or, if you’ve already committed the merge that you want to throw away,</p><pre class="literallayout">$ git reset --hard ORIG_HEAD</pre><p>However, this last command can be dangerous in some cases—never
+away, you can always return to the pre-merge state with</p><pre class="screen">$ git merge --abort</pre><p>Or, if you’ve already committed the merge that you want to throw away,</p><pre class="screen">$ git reset --hard ORIG_HEAD</pre><p>However, this last command can be dangerous in some cases—never
 throw away a commit you have already committed if that commit may
 itself have been merged into another branch, as doing so may confuse
 further merges.</p></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="fast-forwards"></a>Fast-forward merges</h2></div></div></div><p>There is one special case not mentioned above, which is treated
@@ -597,7 +597,7 @@ just performs a "fast-forward"; the head of the current branch is moved forward
 to point at the head of the merged-in branch, without any new commits being
 created.</p></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="fixing-mistakes"></a>Fixing mistakes</h2></div></div></div><p>If you’ve messed up the working tree, but haven’t yet committed your
 mistake, you can return the entire working tree to the last committed
-state with</p><pre class="literallayout">$ git restore --staged --worktree :/</pre><p>If you make a commit that you later wish you hadn’t, there are two
+state with</p><pre class="screen">$ git restore --staged --worktree :/</pre><p>If you make a commit that you later wish you hadn’t, there are two
 fundamentally different ways to fix the problem:</p><div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem">
 You can create a new commit that undoes whatever was done
         by the old commit.  This is the correct thing if your
@@ -610,41 +610,41 @@ You can go back and modify the old commit.  You should
         a branch that has had its history changed.
 </li></ol></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="reverting-a-commit"></a>Fixing a mistake with a new commit</h3></div></div></div><p>Creating a new commit that reverts an earlier change is very easy;
 just pass the <a class="ulink" href="git-revert.html" target="_top">git-revert(1)</a> command a reference to the bad
-commit; for example, to revert the most recent commit:</p><pre class="literallayout">$ git revert HEAD</pre><p>This will create a new commit which undoes the change in HEAD.  You
-will be given a chance to edit the commit message for the new commit.</p><p>You can also revert an earlier change, for example, the next-to-last:</p><pre class="literallayout">$ git revert HEAD^</pre><p>In this case Git will attempt to undo the old change while leaving
+commit; for example, to revert the most recent commit:</p><pre class="screen">$ git revert HEAD</pre><p>This will create a new commit which undoes the change in HEAD.  You
+will be given a chance to edit the commit message for the new commit.</p><p>You can also revert an earlier change, for example, the next-to-last:</p><pre class="screen">$ git revert HEAD^</pre><p>In this case Git will attempt to undo the old change while leaving
 intact any changes made since then.  If more recent changes overlap
 with the changes to be reverted, then you will be asked to fix
 conflicts manually, just as in the case of <a class="link" href="#resolving-a-merge" title="Resolving a merge">resolving a merge</a>.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="fixing-a-mistake-by-rewriting-history"></a>Fixing a mistake by rewriting history</h3></div></div></div><p>If the problematic commit is the most recent commit, and you have not
 yet made that commit public, then you may just
 <a class="link" href="#undoing-a-merge" title="Undoing a merge">destroy it using <code class="literal">git reset</code></a>.</p><p>Alternatively, you
 can edit the working directory and update the index to fix your
-mistake, just as if you were going to <a class="link" href="#how-to-make-a-commit" title="How to make a commit">create a new commit</a>, then run</p><pre class="literallayout">$ git commit --amend</pre><p>which will replace the old commit by a new commit incorporating your
+mistake, just as if you were going to <a class="link" href="#how-to-make-a-commit" title="How to make a commit">create a new commit</a>, then run</p><pre class="screen">$ git commit --amend</pre><p>which will replace the old commit by a new commit incorporating your
 changes, giving you a chance to edit the old commit message first.</p><p>Again, you should never do this to a commit that may already have
 been merged into another branch; use <a class="ulink" href="git-revert.html" target="_top">git-revert(1)</a> instead in
 that case.</p><p>It is also possible to replace commits further back in the history, but
 this is an advanced topic to be left for
 <a class="link" href="#cleaning-up-history" title="Chapter 5. Rewriting history and maintaining patch series">another chapter</a>.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="checkout-of-path"></a>Checking out an old version of a file</h3></div></div></div><p>In the process of undoing a previous bad change, you may find it
 useful to check out an older version of a particular file using
-<a class="ulink" href="git-restore.html" target="_top">git-restore(1)</a>. The command</p><pre class="literallayout">$ git restore --source=HEAD^ path/to/file</pre><p>replaces path/to/file by the contents it had in the commit HEAD^, and
+<a class="ulink" href="git-restore.html" target="_top">git-restore(1)</a>. The command</p><pre class="screen">$ git restore --source=HEAD^ path/to/file</pre><p>replaces path/to/file by the contents it had in the commit HEAD^, and
 also updates the index to match.  It does not change branches.</p><p>If you just want to look at an old version of the file, without
 modifying the working directory, you can do that with
-<a class="ulink" href="git-show.html" target="_top">git-show(1)</a>:</p><pre class="literallayout">$ git show HEAD^:path/to/file</pre><p>which will display the given version of the file.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="interrupted-work"></a>Temporarily setting aside work in progress</h3></div></div></div><p>While you are in the middle of working on something complicated, you
+<a class="ulink" href="git-show.html" target="_top">git-show(1)</a>:</p><pre class="screen">$ git show HEAD^:path/to/file</pre><p>which will display the given version of the file.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="interrupted-work"></a>Temporarily setting aside work in progress</h3></div></div></div><p>While you are in the middle of working on something complicated, you
 find an unrelated but obvious and trivial bug.  You would like to fix it
 before continuing.  You can use <a class="ulink" href="git-stash.html" target="_top">git-stash(1)</a> to save the current
 state of your work, and after fixing the bug (or, optionally after doing
 so on a different branch and then coming back), unstash the
-work-in-progress changes.</p><pre class="literallayout">$ git stash push -m "work in progress for foo feature"</pre><p>This command will save your changes away to the <code class="literal">stash</code>, and
+work-in-progress changes.</p><pre class="screen">$ git stash push -m "work in progress for foo feature"</pre><p>This command will save your changes away to the <code class="literal">stash</code>, and
 reset your working tree and the index to match the tip of your
-current branch.  Then you can make your fix as usual.</p><pre class="literallayout">... edit and test ...
+current branch.  Then you can make your fix as usual.</p><pre class="screen">... edit and test ...
 $ git commit -a -m "blorpl: typofix"</pre><p>After that, you can go back to what you were working on with
-<code class="literal">git stash pop</code>:</p><pre class="literallayout">$ git stash pop</pre></div></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="ensuring-good-performance"></a>Ensuring good performance</h2></div></div></div><p>On large repositories, Git depends on compression to keep the history
+<code class="literal">git stash pop</code>:</p><pre class="screen">$ git stash pop</pre></div></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="ensuring-good-performance"></a>Ensuring good performance</h2></div></div></div><p>On large repositories, Git depends on compression to keep the history
 information from taking up too much space on disk or in memory.  Some
 Git commands may automatically run <a class="ulink" href="git-gc.html" target="_top">git-gc(1)</a>, so you don’t
 have to worry about running it manually.  However, compressing a large
 repository may take a while, so you may want to call <code class="literal">gc</code> explicitly
 to avoid automatic compression kicking in when it is not convenient.</p></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="ensuring-reliability"></a>Ensuring reliability</h2></div></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="checking-for-corruption"></a>Checking the repository for corruption</h3></div></div></div><p>The <a class="ulink" href="git-fsck.html" target="_top">git-fsck(1)</a> command runs a number of self-consistency checks
 on the repository, and reports on any problems.  This may take some
-time.</p><pre class="literallayout">$ git fsck
+time.</p><pre class="screen">$ git fsck
 dangling commit 7281251ddd2a61e38657c827739c57015671a6b3
 dangling commit 2706a059f258c6b245f298dc4ff2ccd30ec21a63
 dangling commit 13472b7c4b80851a1bc551779171dcb03655e9b5
@@ -661,13 +661,13 @@ view real errors.</p></div><div class="section"><div class="titlepage"><div><div
 and then realize that the branch was the only reference you had to
 that point in history.</p><p>Fortunately, Git also keeps a log, called a "reflog", of all the
 previous values of each branch.  So in this case you can still find the
-old history using, for example,</p><pre class="literallayout">$ git log master@{1}</pre><p>This lists the commits reachable from the previous version of the
+old history using, for example,</p><pre class="screen">$ git log master@{1}</pre><p>This lists the commits reachable from the previous version of the
 <code class="literal">master</code> branch head.  This syntax can be used with any Git command
-that accepts a commit, not just with <code class="literal">git log</code>.  Some other examples:</p><pre class="literallayout">$ git show master@{2}           # See where the branch pointed 2,
+that accepts a commit, not just with <code class="literal">git log</code>.  Some other examples:</p><pre class="screen">$ git show master@{2}           # See where the branch pointed 2,
 $ git show master@{3}           # 3, ... changes ago.
 $ gitk master@{yesterday}       # See where it pointed yesterday,
 $ gitk master@{"1 week ago"}    # ... or last week
-$ git log --walk-reflogs master # show reflog entries for master</pre><p>A separate reflog is kept for the HEAD, so</p><pre class="literallayout">$ git show HEAD@{"1 week ago"}</pre><p>will show what HEAD pointed to one week ago, not what the current branch
+$ git log --walk-reflogs master # show reflog entries for master</pre><p>A separate reflog is kept for the HEAD, so</p><pre class="screen">$ git show HEAD@{"1 week ago"}</pre><p>will show what HEAD pointed to one week ago, not what the current branch
 pointed to one week ago.  This allows you to see the history of what
 you’ve checked out.</p><p>The reflogs are kept by default for 30 days, after which they may be
 pruned.  See <a class="ulink" href="git-reflog.html" target="_top">git-reflog(1)</a> and <a class="ulink" href="git-gc.html" target="_top">git-gc(1)</a> to learn
@@ -680,29 +680,29 @@ suppose you delete a branch, then realize you need the history it
 contained.  The reflog is also deleted; however, if you have not yet
 pruned the repository, then you may still be able to find the lost
 commits in the dangling objects that <code class="literal">git fsck</code> reports.  See
-<a class="xref" href="#dangling-objects" title="Dangling objects">the section called “Dangling objects”</a> for the details.</p><pre class="literallayout">$ git fsck
+<a class="xref" href="#dangling-objects" title="Dangling objects">the section called “Dangling objects”</a> for the details.</p><pre class="screen">$ git fsck
 dangling commit 7281251ddd2a61e38657c827739c57015671a6b3
 dangling commit 2706a059f258c6b245f298dc4ff2ccd30ec21a63
 dangling commit 13472b7c4b80851a1bc551779171dcb03655e9b5
 ...</pre><p>You can examine
-one of those dangling commits with, for example,</p><pre class="literallayout">$ gitk 7281251ddd --not --all</pre><p>which does what it sounds like: it says that you want to see the commit
+one of those dangling commits with, for example,</p><pre class="screen">$ gitk 7281251ddd --not --all</pre><p>which does what it sounds like: it says that you want to see the commit
 history that is described by the dangling commit(s), but not the
 history that is described by all your existing branches and tags.  Thus
 you get exactly the history reachable from that commit that is lost.
 (And notice that it might not be just one commit: we only report the
 "tip of the line" as being dangling, but there might be a whole deep
 and complex commit history that was dropped.)</p><p>If you decide you want the history back, you can always create a new
-reference pointing to it, for example, a new branch:</p><pre class="literallayout">$ git branch recovered-branch 7281251ddd</pre><p>Other types of dangling objects (blobs and trees) are also possible, and
+reference pointing to it, for example, a new branch:</p><pre class="screen">$ git branch recovered-branch 7281251ddd</pre><p>Other types of dangling objects (blobs and trees) are also possible, and
 dangling objects can arise in other situations.</p></div></div></div></div><div class="chapter"><div class="titlepage"><div><div><h1 class="title"><a name="sharing-development"></a>Chapter 4. Sharing development with others</h1></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl class="toc"><dt><span class="section"><a href="#getting-updates-With-git-pull">Getting updates with git pull</a></span></dt><dt><span class="section"><a href="#submitting-patches">Submitting patches to a project</a></span></dt><dt><span class="section"><a href="#importing-patches">Importing patches to a project</a></span></dt><dt><span class="section"><a href="#public-repositories">Public Git repositories</a></span></dt><dd><dl><dt><span class="section"><a href="#setting-up-a-public-repository">Setting up a public repository</a></span></dt><dt><span class="section"><a href="#exporting-via-git">Exporting a Git repository via the Git protocol</a></span></dt><dt><span class="section"><a href="#exporting-via-http">Exporting a git repository via HTTP</a></span></dt><dt><span class="section"><a href="#pushing-changes-to-a-public-repository">Pushing changes to a public repository</a></span></dt><dt><span class="section"><a href="#forcing-push">What to do when a push fails</a></span></dt><dt><span class="section"><a href="#setting-up-a-shared-repository">Setting up a shared repository</a></span></dt><dt><span class="section"><a href="#setting-up-gitweb">Allowing web browsing of a repository</a></span></dt></dl></dd><dt><span class="section"><a href="#how-to-get-a-git-repository-with-minimal-history">How to get a Git repository with minimal history</a></span></dt><dt><span class="section"><a href="#sharing-development-examples">Examples</a></span></dt><dd><dl><dt><span class="section"><a href="#maintaining-topic-branches">Maintaining topic branches for a Linux subsystem maintainer</a></span></dt></dl></dd></dl></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="getting-updates-With-git-pull"></a>Getting updates with git pull</h2></div></div></div><p>After you clone a repository and commit a few changes of your own, you
 may wish to check the original repository for updates and merge them
 into your own work.</p><p>We have already seen <a class="link" href="#Updating-a-repository-With-git-fetch" title="Updating a repository with git fetch">how to keep remote-tracking branches up to date</a> with <a class="ulink" href="git-fetch.html" target="_top">git-fetch(1)</a>,
 and how to merge two branches.  So you can merge in changes from the
-original repository’s master branch with:</p><pre class="literallayout">$ git fetch
+original repository’s master branch with:</p><pre class="screen">$ git fetch
 $ git merge origin/master</pre><p>However, the <a class="ulink" href="git-pull.html" target="_top">git-pull(1)</a> command provides a way to do this in
-one step:</p><pre class="literallayout">$ git pull origin master</pre><p>In fact, if you have <code class="literal">master</code> checked out, then this branch has been
+one step:</p><pre class="screen">$ git pull origin master</pre><p>In fact, if you have <code class="literal">master</code> checked out, then this branch has been
 configured by <code class="literal">git clone</code> to get changes from the HEAD branch of the
 origin repository.  So often you can
-accomplish the above with just a simple</p><pre class="literallayout">$ git pull</pre><p>This command will fetch changes from the remote branches to your
+accomplish the above with just a simple</p><pre class="screen">$ git pull</pre><p>This command will fetch changes from the remote branches to your
 remote-tracking branches <code class="literal">origin/*</code>, and merge the default branch into
 the current branch.</p><p>More generally, a branch that is created from a remote-tracking branch
 will pull
@@ -715,9 +715,9 @@ repository that you pulled from.</p><p>(But note that no such commit will be cre
 <a class="link" href="#fast-forwards" title="Fast-forward merges">fast-forward</a>; instead, your branch will just be
 updated to point to the latest commit from the upstream branch.)</p><p>The <code class="literal">git pull</code> command can also be given <code class="literal">.</code> as the "remote" repository,
 in which case it just merges in a branch from the current repository; so
-the commands</p><pre class="literallayout">$ git pull . branch
+the commands</p><pre class="screen">$ git pull . branch
 $ git merge branch</pre><p>are roughly equivalent.</p></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="submitting-patches"></a>Submitting patches to a project</h2></div></div></div><p>If you just have a few changes, the simplest way to submit them may
-just be to send them as patches in email:</p><p>First, use <a class="ulink" href="git-format-patch.html" target="_top">git-format-patch(1)</a>; for example:</p><pre class="literallayout">$ git format-patch origin</pre><p>will produce a numbered series of files in the current directory, one
+just be to send them as patches in email:</p><p>First, use <a class="ulink" href="git-format-patch.html" target="_top">git-format-patch(1)</a>; for example:</p><pre class="screen">$ git format-patch origin</pre><p>will produce a numbered series of files in the current directory, one
 for each patch in the current branch but not in <code class="literal">origin/HEAD</code>.</p><p><code class="literal">git format-patch</code> can include an initial "cover letter". You can insert
 commentary on individual patches after the three dash line which
 <code class="literal">format-patch</code> places after the commit message but before the patch
@@ -730,12 +730,12 @@ Consult the mailing list for your project first to determine
 their requirements for submitting patches.</p></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="importing-patches"></a>Importing patches to a project</h2></div></div></div><p>Git also provides a tool called <a class="ulink" href="git-am.html" target="_top">git-am(1)</a> (am stands for
 "apply mailbox"), for importing such an emailed series of patches.
 Just save all of the patch-containing messages, in order, into a
-single mailbox file, say <code class="literal">patches.mbox</code>, then run</p><pre class="literallayout">$ git am -3 patches.mbox</pre><p>Git will apply each patch in order; if any conflicts are found, it
+single mailbox file, say <code class="literal">patches.mbox</code>, then run</p><pre class="screen">$ git am -3 patches.mbox</pre><p>Git will apply each patch in order; if any conflicts are found, it
 will stop, and you can fix the conflicts as described in
 "<a class="link" href="#resolving-a-merge" title="Resolving a merge">Resolving a merge</a>".  (The <code class="literal">-3</code> option tells
 Git to perform a merge; if you would prefer it just to abort and
 leave your tree and index untouched, you may omit that option.)</p><p>Once the index is updated with the results of the conflict
-resolution, instead of creating a new commit, just run</p><pre class="literallayout">$ git am --continue</pre><p>and Git will create the commit for you and continue applying the
+resolution, instead of creating a new commit, just run</p><pre class="screen">$ git am --continue</pre><p>and Git will create the commit for you and continue applying the
 remaining patches from the mailbox.</p><p>The final result will be a series of commits, one for each patch in
 the original mailbox, with authorship and commit log message each
 taken from the message containing each patch.</p></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="public-repositories"></a>Public Git repositories</h2></div></div></div><p>Another way to submit changes to a project is to tell the maintainer
@@ -745,8 +745,8 @@ updates from the "main" repository, but it works just as well in the
 other direction.</p><p>If you and the maintainer both have accounts on the same machine, then
 you can just pull changes from each other’s repositories directly;
 commands that accept repository URLs as arguments will also accept a
-local directory name:</p><pre class="literallayout">$ git clone /path/to/repository
-$ git pull /path/to/other/repository</pre><p>or an ssh URL:</p><pre class="literallayout">$ git clone ssh://yourhost/~you/repository</pre><p>For projects with few developers, or for synchronizing a few private
+local directory name:</p><pre class="screen">$ git clone /path/to/repository
+$ git pull /path/to/other/repository</pre><p>or an ssh URL:</p><pre class="screen">$ git clone ssh://yourhost/~you/repository</pre><p>For projects with few developers, or for synchronizing a few private
 repositories, this may be all you need.</p><p>However, the more common way to do this is to maintain a separate public
 repository (usually on a different host) for others to pull changes
 from.  This is usually more convenient, and allows you to cleanly
@@ -765,7 +765,7 @@ your personal repo ------------------&gt; your public repo
       |               they push             V
 their public repo &lt;------------------- their repo</pre><p>We explain how to do this in the following sections.</p><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="setting-up-a-public-repository"></a>Setting up a public repository</h3></div></div></div><p>Assume your personal repository is in the directory <code class="literal">~/proj</code>.  We
 first create a new clone of the repository and tell <code class="literal">git daemon</code> that it
-is meant to be public:</p><pre class="literallayout">$ git clone --bare ~/proj proj.git
+is meant to be public:</p><pre class="screen">$ git clone --bare ~/proj proj.git
 $ touch proj.git/git-daemon-export-ok</pre><p>The resulting directory proj.git contains a "bare" git repository—it is
 just the contents of the <code class="literal">.git</code> directory, without any files checked out
 around it.</p><p>Next, copy <code class="literal">proj.git</code> to the server where you plan to host the
@@ -782,12 +782,12 @@ arguments will further restrict the exports to those paths.</p><p>You can also r
 examples section.)</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="exporting-via-http"></a>Exporting a git repository via HTTP</h3></div></div></div><p>The Git protocol gives better performance and reliability, but on a
 host with a web server set up, HTTP exports may be simpler to set up.</p><p>All you need to do is place the newly created bare Git repository in
 a directory that is exported by the web server, and make some
-adjustments to give web clients some extra information they need:</p><pre class="literallayout">$ mv proj.git /home/you/public_html/proj.git
+adjustments to give web clients some extra information they need:</p><pre class="screen">$ mv proj.git /home/you/public_html/proj.git
 $ cd proj.git
 $ git --bare update-server-info
 $ mv hooks/post-update.sample hooks/post-update</pre><p>(For an explanation of the last two lines, see
 <a class="ulink" href="git-update-server-info.html" target="_top">git-update-server-info(1)</a> and <a class="ulink" href="githooks.html" target="_top">githooks(5)</a>.)</p><p>Advertise the URL of <code class="literal">proj.git</code>.  Anybody else should then be able to
-clone or pull from that URL, for example with a command line like:</p><pre class="literallayout">$ git clone http://yourserver.com/~you/proj.git</pre><p>(See also
+clone or pull from that URL, for example with a command line like:</p><pre class="screen">$ git clone http://yourserver.com/~you/proj.git</pre><p>(See also
 <a class="ulink" href="howto/setup-git-server-over-http.html" target="_top">setup-git-server-over-http</a>
 for a slightly more sophisticated setup using WebDAV which also
 allows pushing over HTTP.)</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="pushing-changes-to-a-public-repository"></a>Pushing changes to a public repository</h3></div></div></div><p>Note that the two techniques outlined above (exporting via
@@ -796,7 +796,7 @@ maintainers to fetch your latest changes, but they do not allow write
 access, which you will need to update the public repository with the
 latest changes created in your private repository.</p><p>The simplest way to do this is using <a class="ulink" href="git-push.html" target="_top">git-push(1)</a> and ssh; to
 update the remote branch named <code class="literal">master</code> with the latest state of your
-branch named <code class="literal">master</code>, run</p><pre class="literallayout">$ git push ssh://yourserver.com/~you/proj.git master:master</pre><p>or just</p><pre class="literallayout">$ git push ssh://yourserver.com/~you/proj.git master</pre><p>As with <code class="literal">git fetch</code>, <code class="literal">git push</code> will complain if this does not result in a
+branch named <code class="literal">master</code>, run</p><pre class="screen">$ git push ssh://yourserver.com/~you/proj.git master:master</pre><p>or just</p><pre class="screen">$ git push ssh://yourserver.com/~you/proj.git master</pre><p>As with <code class="literal">git fetch</code>, <code class="literal">git push</code> will complain if this does not result in a
 <a class="link" href="#fast-forwards" title="Fast-forward merges">fast-forward</a>; see the following section for details on
 handling this case.</p><p>Note that the target of a <code class="literal">push</code> is normally a
 <a class="link" href="#def_bare_repository">bare</a> repository.  You can also push to a
@@ -804,12 +804,12 @@ repository that has a checked-out working tree, but a push to update the
 currently checked-out branch is denied by default to prevent confusion.
 See the description of the receive.denyCurrentBranch option
 in <a class="ulink" href="git-config.html" target="_top">git-config(1)</a> for details.</p><p>As with <code class="literal">git fetch</code>, you may also set up configuration options to
-save typing; so, for example:</p><pre class="literallayout">$ git remote add public-repo ssh://yourserver.com/~you/proj.git</pre><p>adds the following to <code class="literal">.git/config</code>:</p><pre class="literallayout">[remote "public-repo"]
+save typing; so, for example:</p><pre class="screen">$ git remote add public-repo ssh://yourserver.com/~you/proj.git</pre><p>adds the following to <code class="literal">.git/config</code>:</p><pre class="screen">[remote "public-repo"]
         url = yourserver.com:proj.git
-        fetch = +refs/heads/*:refs/remotes/example/*</pre><p>which lets you do the same push with just</p><pre class="literallayout">$ git push public-repo master</pre><p>See the explanations of the <code class="literal">remote.&lt;name&gt;.url</code>,
+        fetch = +refs/heads/*:refs/remotes/example/*</pre><p>which lets you do the same push with just</p><pre class="screen">$ git push public-repo master</pre><p>See the explanations of the <code class="literal">remote.&lt;name&gt;.url</code>,
 <code class="literal">branch.&lt;name&gt;.remote</code>, and <code class="literal">remote.&lt;name&gt;.push</code> options in
 <a class="ulink" href="git-config.html" target="_top">git-config(1)</a> for details.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="forcing-push"></a>What to do when a push fails</h3></div></div></div><p>If a push would not result in a <a class="link" href="#fast-forwards" title="Fast-forward merges">fast-forward</a> of the
-remote branch, then it will fail with an error like:</p><pre class="literallayout"> ! [rejected]        master -&gt; master (non-fast-forward)
+remote branch, then it will fail with an error like:</p><pre class="screen"> ! [rejected]        master -&gt; master (non-fast-forward)
 error: failed to push some refs to '...'
 hint: Updates were rejected because the tip of your current branch is behind
 hint: its remote counterpart. Integrate the remote changes (e.g.
@@ -823,8 +823,8 @@ use <code class="literal">git commit --amend</code> to replace already-published
 use <code class="literal">git rebase</code> to rebase any already-published commits (as
           in <a class="xref" href="#using-git-rebase" title="Keeping a patch series up to date using git rebase">the section called “Keeping a patch series up to date using git rebase”</a>).
 </li></ul></div><p>You may force <code class="literal">git push</code> to perform the update anyway by preceding the
-branch name with a plus sign:</p><pre class="literallayout">$ git push ssh://yourserver.com/~you/proj.git +master</pre><p>Note the addition of the <code class="literal">+</code> sign.  Alternatively, you can use the
-<code class="literal">-f</code> flag to force the remote update, as in:</p><pre class="literallayout">$ git push -f ssh://yourserver.com/~you/proj.git master</pre><p>Normally whenever a branch head in a public repository is modified, it
+branch name with a plus sign:</p><pre class="screen">$ git push ssh://yourserver.com/~you/proj.git +master</pre><p>Note the addition of the <code class="literal">+</code> sign.  Alternatively, you can use the
+<code class="literal">-f</code> flag to force the remote update, as in:</p><pre class="screen">$ git push -f ssh://yourserver.com/~you/proj.git master</pre><p>Normally whenever a branch head in a public repository is modified, it
 is modified to point to a descendant of the commit that it pointed to
 before.  By forcing a push in this situation, you break that convention.
 (See <a class="xref" href="#problems-With-rewriting-history" title="Problems with rewriting history">the section called “Problems with rewriting history”</a>.)</p><p>Nevertheless, this is a common practice for people that need a simple
@@ -889,7 +889,7 @@ A "release" tree into which tested patches are moved for final sanity
    him a "please pull" request.)
 </li></ul></div><p>He also uses a set of temporary branches ("topic branches"), each
 containing a logical grouping of patches.</p><p>To set this up, first create your work tree by cloning Linus’s public
-tree:</p><pre class="literallayout">$ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git work
+tree:</p><pre class="screen">$ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git work
 $ cd work</pre><p>Linus’s tree will be stored in the remote-tracking branch named origin/master,
 and can be updated using <a class="ulink" href="git-fetch.html" target="_top">git-fetch(1)</a>; you can track other
 public trees using <a class="ulink" href="git-remote.html" target="_top">git-remote(1)</a> to set up a "remote" and
@@ -897,8 +897,8 @@ public trees using <a class="ulink" href="git-remote.html" target="_top">git-rem
 <a class="xref" href="#repositories-and-branches" title="Chapter 1. Repositories and Branches">Chapter 1, <i>Repositories and Branches</i></a>.</p><p>Now create the branches in which you are going to work; these start out
 at the current tip of origin/master branch, and should be set up (using
 the <code class="literal">--track</code> option to <a class="ulink" href="git-branch.html" target="_top">git-branch(1)</a>) to merge changes in from
-Linus by default.</p><pre class="literallayout">$ git branch --track test origin/master
-$ git branch --track release origin/master</pre><p>These can be easily kept up to date using <a class="ulink" href="git-pull.html" target="_top">git-pull(1)</a>.</p><pre class="literallayout">$ git switch test &amp;&amp; git pull
+Linus by default.</p><pre class="screen">$ git branch --track test origin/master
+$ git branch --track release origin/master</pre><p>These can be easily kept up to date using <a class="ulink" href="git-pull.html" target="_top">git-pull(1)</a>.</p><pre class="screen">$ git switch test &amp;&amp; git pull
 $ git switch release &amp;&amp; git pull</pre><p>Important note!  If you have any local changes in these branches, then
 this merge will create a commit object in the history (with no local
 changes Git will simply do a "fast-forward" merge).  Many people dislike
@@ -907,40 +907,40 @@ doing this capriciously in the <code class="literal">release</code> branch, as t
 will become part of the permanent history when you ask Linus to pull
 from the release branch.</p><p>A few configuration variables (see <a class="ulink" href="git-config.html" target="_top">git-config(1)</a>) can
 make it easy to push both branches to your public tree.  (See
-<a class="xref" href="#setting-up-a-public-repository" title="Setting up a public repository">the section called “Setting up a public repository”</a>.)</p><pre class="literallayout">$ cat &gt;&gt; .git/config &lt;&lt;EOF
+<a class="xref" href="#setting-up-a-public-repository" title="Setting up a public repository">the section called “Setting up a public repository”</a>.)</p><pre class="screen">$ cat &gt;&gt; .git/config &lt;&lt;EOF
 [remote "mytree"]
         url =  master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux.git
         push = release
         push = test
 EOF</pre><p>Then you can push both the test and release trees using
-<a class="ulink" href="git-push.html" target="_top">git-push(1)</a>:</p><pre class="literallayout">$ git push mytree</pre><p>or push just one of the test and release branches using:</p><pre class="literallayout">$ git push mytree test</pre><p>or</p><pre class="literallayout">$ git push mytree release</pre><p>Now to apply some patches from the community.  Think of a short
+<a class="ulink" href="git-push.html" target="_top">git-push(1)</a>:</p><pre class="screen">$ git push mytree</pre><p>or push just one of the test and release branches using:</p><pre class="screen">$ git push mytree test</pre><p>or</p><pre class="screen">$ git push mytree release</pre><p>Now to apply some patches from the community.  Think of a short
 snappy name for a branch to hold this patch (or related group of
 patches), and create a new branch from a recent stable tag of
 Linus’s branch. Picking a stable base for your branch will:
 1) help you: by avoiding inclusion of unrelated and perhaps lightly
 tested changes
-2) help future bug hunters that use <code class="literal">git bisect</code> to find problems</p><pre class="literallayout">$ git switch -c speed-up-spinlocks v2.6.35</pre><p>Now you apply the patch(es), run some tests, and commit the change(s).  If
+2) help future bug hunters that use <code class="literal">git bisect</code> to find problems</p><pre class="screen">$ git switch -c speed-up-spinlocks v2.6.35</pre><p>Now you apply the patch(es), run some tests, and commit the change(s).  If
 the patch is a multi-part series, then you should apply each as a separate
-commit to this branch.</p><pre class="literallayout">$ ... patch ... test  ... commit [ ... patch ... test ... commit ]*</pre><p>When you are happy with the state of this change, you can merge it into the
-"test" branch in preparation to make it public:</p><pre class="literallayout">$ git switch test &amp;&amp; git merge speed-up-spinlocks</pre><p>It is unlikely that you would have any conflicts here … but you might if you
+commit to this branch.</p><pre class="screen">$ ... patch ... test  ... commit [ ... patch ... test ... commit ]*</pre><p>When you are happy with the state of this change, you can merge it into the
+"test" branch in preparation to make it public:</p><pre class="screen">$ git switch test &amp;&amp; git merge speed-up-spinlocks</pre><p>It is unlikely that you would have any conflicts here … but you might if you
 spent a while on this step and had also pulled new versions from upstream.</p><p>Sometime later when enough time has passed and testing done, you can pull the
 same branch into the <code class="literal">release</code> tree ready to go upstream.  This is where you
 see the value of keeping each patch (or patch series) in its own branch.  It
-means that the patches can be moved into the <code class="literal">release</code> tree in any order.</p><pre class="literallayout">$ git switch release &amp;&amp; git merge speed-up-spinlocks</pre><p>After a while, you will have a number of branches, and despite the
+means that the patches can be moved into the <code class="literal">release</code> tree in any order.</p><pre class="screen">$ git switch release &amp;&amp; git merge speed-up-spinlocks</pre><p>After a while, you will have a number of branches, and despite the
 well chosen names you picked for each of them, you may forget what
 they are for, or what status they are in.  To get a reminder of what
-changes are in a specific branch, use:</p><pre class="literallayout">$ git log linux..branchname | git shortlog</pre><p>To see whether it has already been merged into the test or release branches,
-use:</p><pre class="literallayout">$ git log test..branchname</pre><p>or</p><pre class="literallayout">$ git log release..branchname</pre><p>(If this branch has not yet been merged, you will see some log entries.
+changes are in a specific branch, use:</p><pre class="screen">$ git log linux..branchname | git shortlog</pre><p>To see whether it has already been merged into the test or release branches,
+use:</p><pre class="screen">$ git log test..branchname</pre><p>or</p><pre class="screen">$ git log release..branchname</pre><p>(If this branch has not yet been merged, you will see some log entries.
 If it has been merged, then there will be no output.)</p><p>Once a patch completes the great cycle (moving from test to release,
 then pulled by Linus, and finally coming back into your local
 <code class="literal">origin/master</code> branch), the branch for this change is no longer needed.
-You detect this when the output from:</p><pre class="literallayout">$ git log origin..branchname</pre><p>is empty.  At this point the branch can be deleted:</p><pre class="literallayout">$ git branch -d branchname</pre><p>Some changes are so trivial that it is not necessary to create a separate
+You detect this when the output from:</p><pre class="screen">$ git log origin..branchname</pre><p>is empty.  At this point the branch can be deleted:</p><pre class="screen">$ git branch -d branchname</pre><p>Some changes are so trivial that it is not necessary to create a separate
 branch and then merge into each of the test and release branches.  For
 these changes, just apply directly to the <code class="literal">release</code> branch, and then
 merge that into the <code class="literal">test</code> branch.</p><p>After pushing your work to <code class="literal">mytree</code>, you can use
 <a class="ulink" href="git-request-pull.html" target="_top">git-request-pull(1)</a> to prepare a "please pull" request message
-to send to Linus:</p><pre class="literallayout">$ git push mytree
-$ git request-pull origin mytree release</pre><p>Here are some of the scripts that simplify all this even further.</p><pre class="literallayout">==== update script ====
+to send to Linus:</p><pre class="screen">$ git push mytree
+$ git request-pull origin mytree release</pre><p>Here are some of the scripts that simplify all this even further.</p><pre class="screen">==== update script ====
 # Update a branch in my Git tree.  If the branch to be updated
 # is origin, then pull from kernel.org.  Otherwise merge
 # origin/master branch into test|release branch
@@ -962,7 +962,7 @@ origin)
         echo "usage: $0 origin|test|release" 1&gt;&amp;2
         exit 1
         ;;
-esac</pre><pre class="literallayout">==== merge script ====
+esac</pre><pre class="screen">==== merge script ====
 # Merge a branch into either the test or release branch
 
 pname=$0
@@ -990,7 +990,7 @@ test|release)
 *)
         usage
         ;;
-esac</pre><pre class="literallayout">==== status script ====
+esac</pre><pre class="screen">==== status script ====
 # report on status of my ia64 Git tree
 
 gb=$(tput setab 2)
@@ -1060,7 +1060,7 @@ The complete series produces the same end result as your own
 </li></ol></div><p>We will introduce some tools that can help you do this, explain how to
 use them, and then explain some of the problems that can arise because
 you are rewriting history.</p></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="using-git-rebase"></a>Keeping a patch series up to date using git rebase</h2></div></div></div><p>Suppose that you create a branch <code class="literal">mywork</code> on a remote-tracking branch
-<code class="literal">origin</code>, and create some commits on top of it:</p><pre class="literallayout">$ git switch -c mywork origin
+<code class="literal">origin</code>, and create some commits on top of it:</p><pre class="screen">$ git switch -c mywork origin
 $ vi file.txt
 $ git commit
 $ vi otherfile.txt
@@ -1076,7 +1076,7 @@ the result would create a new merge commit, like this:</p><pre class="literallay
         \        \
          a--b--c--m &lt;-- mywork</pre><p>However, if you prefer to keep the history in mywork a simple series of
 commits without any merges, you may instead choose to use
-<a class="ulink" href="git-rebase.html" target="_top">git-rebase(1)</a>:</p><pre class="literallayout">$ git switch mywork
+<a class="ulink" href="git-rebase.html" target="_top">git-rebase(1)</a>:</p><pre class="screen">$ git switch mywork
 $ git rebase origin</pre><p>This will remove each of your commits from mywork, temporarily saving
 them as patches (in a directory named <code class="literal">.git/rebase-apply</code>), update mywork to
 point at the latest version of origin, then apply each of the saved
@@ -1085,24 +1085,24 @@ patches to the new mywork.  The result will look like:</p><pre class="literallay
                   a'--b'--c' &lt;-- mywork</pre><p>In the process, it may discover conflicts.  In that case it will stop
 and allow you to fix the conflicts; after fixing conflicts, use <code class="literal">git add</code>
 to update the index with those contents, and then, instead of
-running <code class="literal">git commit</code>, just run</p><pre class="literallayout">$ git rebase --continue</pre><p>and Git will continue applying the rest of the patches.</p><p>At any point you may use the <code class="literal">--abort</code> option to abort this process and
-return mywork to the state it had before you started the rebase:</p><pre class="literallayout">$ git rebase --abort</pre><p>If you need to reorder or edit a number of commits in a branch, it may
+running <code class="literal">git commit</code>, just run</p><pre class="screen">$ git rebase --continue</pre><p>and Git will continue applying the rest of the patches.</p><p>At any point you may use the <code class="literal">--abort</code> option to abort this process and
+return mywork to the state it had before you started the rebase:</p><pre class="screen">$ git rebase --abort</pre><p>If you need to reorder or edit a number of commits in a branch, it may
 be easier to use <code class="literal">git rebase -i</code>, which allows you to reorder and
 squash commits, as well as marking them for individual editing during
 the rebase.  See <a class="xref" href="#interactive-rebase" title="Using interactive rebases">the section called “Using interactive rebases”</a> for details, and
 <a class="xref" href="#reordering-patch-series" title="Reordering or selecting from a patch series">the section called “Reordering or selecting from a patch series”</a> for alternatives.</p></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="rewriting-one-commit"></a>Rewriting a single commit</h2></div></div></div><p>We saw in <a class="xref" href="#fixing-a-mistake-by-rewriting-history" title="Fixing a mistake by rewriting history">the section called “Fixing a mistake by rewriting history”</a> that you can replace the
-most recent commit using</p><pre class="literallayout">$ git commit --amend</pre><p>which will replace the old commit by a new commit incorporating your
+most recent commit using</p><pre class="screen">$ git commit --amend</pre><p>which will replace the old commit by a new commit incorporating your
 changes, giving you a chance to edit the old commit message first.
 This is useful for fixing typos in your last commit, or for adjusting
 the patch contents of a poorly staged commit.</p><p>If you need to amend commits from deeper in your history, you can
 use <a class="link" href="#interactive-rebase" title="Using interactive rebases">interactive rebase’s <code class="literal">edit</code> instruction</a>.</p></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="reordering-patch-series"></a>Reordering or selecting from a patch series</h2></div></div></div><p>Sometimes you want to edit a commit deeper in your history.  One
 approach is to use <code class="literal">git format-patch</code> to create a series of patches
-and then reset the state to before the patches:</p><pre class="literallayout">$ git format-patch origin
+and then reset the state to before the patches:</p><pre class="screen">$ git format-patch origin
 $ git reset --hard origin</pre><p>Then modify, reorder, or eliminate patches as needed before applying
-them again with <a class="ulink" href="git-am.html" target="_top">git-am(1)</a>:</p><pre class="literallayout">$ git am *.patch</pre></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="interactive-rebase"></a>Using interactive rebases</h2></div></div></div><p>You can also edit a patch series with an interactive rebase.  This is
+them again with <a class="ulink" href="git-am.html" target="_top">git-am(1)</a>:</p><pre class="screen">$ git am *.patch</pre></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="interactive-rebase"></a>Using interactive rebases</h2></div></div></div><p>You can also edit a patch series with an interactive rebase.  This is
 the same as <a class="link" href="#reordering-patch-series" title="Reordering or selecting from a patch series">reordering a patch series using <code class="literal">format-patch</code></a>, so use whichever interface you like best.</p><p>Rebase your current HEAD on the last commit you want to retain as-is.
-For example, if you want to reorder the last 5 commits, use:</p><pre class="literallayout">$ git rebase -i HEAD~5</pre><p>This will open your editor with a list of steps to be taken to perform
-your rebase.</p><pre class="literallayout">pick deadbee The oneline of this commit
+For example, if you want to reorder the last 5 commits, use:</p><pre class="screen">$ git rebase -i HEAD~5</pre><p>This will open your editor with a list of steps to be taken to perform
+your rebase.</p><pre class="screen">pick deadbee The oneline of this commit
 pick fa1afe1 The oneline of the next commit
 ...
 
@@ -1191,10 +1191,10 @@ working on an otherwise merge-heavy project, keep the history
 linear by rebasing against the latest upstream version before
 publishing.</p></div></div><div class="chapter"><div class="titlepage"><div><div><h1 class="title"><a name="advanced-branch-management"></a>Chapter 6. Advanced branch management</h1></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl class="toc"><dt><span class="section"><a href="#fetching-individual-branches">Fetching individual branches</a></span></dt><dt><span class="section"><a href="#fetch-fast-forwards">git fetch and fast-forwards</a></span></dt><dt><span class="section"><a href="#forcing-fetch">Forcing git fetch to do non-fast-forward updates</a></span></dt><dt><span class="section"><a href="#remote-branch-configuration">Configuring remote-tracking branches</a></span></dt></dl></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="fetching-individual-branches"></a>Fetching individual branches</h2></div></div></div><p>Instead of using <a class="ulink" href="git-remote.html" target="_top">git-remote(1)</a>, you can also choose just
 to update one branch at a time, and to store it locally under an
-arbitrary name:</p><pre class="literallayout">$ git fetch origin todo:my-todo-work</pre><p>The first argument, <code class="literal">origin</code>, just tells Git to fetch from the
+arbitrary name:</p><pre class="screen">$ git fetch origin todo:my-todo-work</pre><p>The first argument, <code class="literal">origin</code>, just tells Git to fetch from the
 repository you originally cloned from.  The second argument tells Git
 to fetch the branch named <code class="literal">todo</code> from the remote repository, and to
-store it locally under the name <code class="literal">refs/heads/my-todo-work</code>.</p><p>You can also fetch branches from other repositories; so</p><pre class="literallayout">$ git fetch git://example.com/proj.git master:example-master</pre><p>will create a new branch named <code class="literal">example-master</code> and store in it the
+store it locally under the name <code class="literal">refs/heads/my-todo-work</code>.</p><p>You can also fetch branches from other repositories; so</p><pre class="screen">$ git fetch git://example.com/proj.git master:example-master</pre><p>will create a new branch named <code class="literal">example-master</code> and store in it the
 branch named <code class="literal">master</code> from the repository at the given URL.  If you
 already have a branch named example-master, it will attempt to
 <a class="link" href="#fast-forwards" title="Fast-forward merges">fast-forward</a> to the commit given by example.com’s
@@ -1214,12 +1214,12 @@ described in the following section.  However, note that in the
 situation above this may mean losing the commits labeled <code class="literal">a</code> and <code class="literal">b</code>,
 unless you’ve already created a reference of your own pointing to
 them.</p></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="forcing-fetch"></a>Forcing git fetch to do non-fast-forward updates</h2></div></div></div><p>If git fetch fails because the new head of a branch is not a
-descendant of the old head, you may force the update with:</p><pre class="literallayout">$ git fetch git://example.com/proj.git +master:refs/remotes/example/master</pre><p>Note the addition of the <code class="literal">+</code> sign.  Alternatively, you can use the <code class="literal">-f</code>
-flag to force updates of all the fetched branches, as in:</p><pre class="literallayout">$ git fetch -f origin</pre><p>Be aware that commits that the old version of example/master pointed at
+descendant of the old head, you may force the update with:</p><pre class="screen">$ git fetch git://example.com/proj.git +master:refs/remotes/example/master</pre><p>Note the addition of the <code class="literal">+</code> sign.  Alternatively, you can use the <code class="literal">-f</code>
+flag to force updates of all the fetched branches, as in:</p><pre class="screen">$ git fetch -f origin</pre><p>Be aware that commits that the old version of example/master pointed at
 may be lost, as we saw in the previous section.</p></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="remote-branch-configuration"></a>Configuring remote-tracking branches</h2></div></div></div><p>We saw above that <code class="literal">origin</code> is just a shortcut to refer to the
 repository that you originally cloned from.  This information is
 stored in Git configuration variables, which you can see using
-<a class="ulink" href="git-config.html" target="_top">git-config(1)</a>:</p><pre class="literallayout">$ git config -l
+<a class="ulink" href="git-config.html" target="_top">git-config(1)</a>:</p><pre class="screen">$ git config -l
 core.repositoryformatversion=0
 core.filemode=true
 core.logallrefupdates=true
@@ -1227,11 +1227,11 @@ remote.origin.url=git://git.kernel.org/pub/scm/git/git.git
 remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
 branch.master.remote=origin
 branch.master.merge=refs/heads/master</pre><p>If there are other repositories that you also use frequently, you can
-create similar configuration options to save typing; for example,</p><pre class="literallayout">$ git remote add example git://example.com/proj.git</pre><p>adds the following to <code class="literal">.git/config</code>:</p><pre class="literallayout">[remote "example"]
+create similar configuration options to save typing; for example,</p><pre class="screen">$ git remote add example git://example.com/proj.git</pre><p>adds the following to <code class="literal">.git/config</code>:</p><pre class="screen">[remote "example"]
         url = git://example.com/proj.git
         fetch = +refs/heads/*:refs/remotes/example/*</pre><p>Also note that the above configuration can be performed by directly
 editing the file <code class="literal">.git/config</code> instead of using <a class="ulink" href="git-remote.html" target="_top">git-remote(1)</a>.</p><p>After configuring the remote, the following three commands will do the
-same thing:</p><pre class="literallayout">$ git fetch git://example.com/proj.git +refs/heads/*:refs/remotes/example/*
+same thing:</p><pre class="screen">$ git fetch git://example.com/proj.git +refs/heads/*:refs/remotes/example/*
 $ git fetch example +refs/heads/*:refs/remotes/example/*
 $ git fetch example</pre><p>See <a class="ulink" href="git-config.html" target="_top">git-config(1)</a> for more details on the configuration
 options mentioned above and <a class="ulink" href="git-fetch.html" target="_top">git-fetch(1)</a> for more details on
@@ -1277,7 +1277,7 @@ A <a class="link" href="#def_tag_object">"tag" object</a> symbolically identifie
 </li></ul></div><p>The object types in some more detail:</p><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="commit-object"></a>Commit Object</h3></div></div></div><p>The "commit" object links a physical state of a tree with a description
 of how we got there and why.  Use the <code class="literal">--pretty=raw</code> option to
 <a class="ulink" href="git-show.html" target="_top">git-show(1)</a> or <a class="ulink" href="git-log.html" target="_top">git-log(1)</a> to examine your favorite
-commit:</p><pre class="literallayout">$ git show -s --pretty=raw 2be7fcb476
+commit:</p><pre class="screen">$ git show -s --pretty=raw 2be7fcb476
 commit 2be7fcb4764f2dbcee52635b91fedb1b3dcf7ab4
 tree fb3a8bdd0ceddd019615af4d57a53f43d8cee2bf
 parent 257a84d9d02e90447b149af58b271c19405edb6a
@@ -1317,7 +1317,7 @@ file data at changing paths suggests a rename.  (See, for example, the
 commit whose parent is normally the current HEAD, and whose tree is
 taken from the content currently stored in the index.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="tree-object"></a>Tree Object</h3></div></div></div><p>The ever-versatile <a class="ulink" href="git-show.html" target="_top">git-show(1)</a> command can also be used to
 examine tree objects, but <a class="ulink" href="git-ls-tree.html" target="_top">git-ls-tree(1)</a> will give you more
-details:</p><pre class="literallayout">$ git ls-tree fb3a8bdd0ce
+details:</p><pre class="screen">$ git ls-tree fb3a8bdd0ce
 100644 blob 63c918c667fa005ff12ad89437f2fdc80926e21c    .gitignore
 100644 blob 5529b198e8d14decbe4ad99db3f7fb632de0439d    .mailmap
 100644 blob 6ff87c4664981e4397625791c8ea3bbb5f2279a3    COPYING
@@ -1338,7 +1338,7 @@ between two related tree objects, since it can ignore any entries with
 identical object names.</p><p>(Note: in the presence of submodules, trees may also have commits as
 entries.  See <a class="xref" href="#submodules" title="Chapter 8. Submodules">Chapter 8, <i>Submodules</i></a> for documentation.)</p><p>Note that the files all have mode 644 or 755: Git actually only pays
 attention to the executable bit.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="blob-object"></a>Blob Object</h3></div></div></div><p>You can use <a class="ulink" href="git-show.html" target="_top">git-show(1)</a> to examine the contents of a blob; take,
-for example, the blob in the entry for <code class="literal">COPYING</code> from the tree above:</p><pre class="literallayout">$ git show 6ff87c4664
+for example, the blob in the entry for <code class="literal">COPYING</code> from the tree above:</p><pre class="screen">$ git show 6ff87c4664
 
  Note that the only valid version of the GPL as far as this project
  is concerned is _this_ particular version of the license (ie v2, not
@@ -1369,7 +1369,7 @@ sending out a single email that tells the people the name (SHA-1 hash)
 of the top commit, and digitally sign that email using something
 like GPG/PGP.</p><p>To assist in this, Git also provides the tag object…</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="tag-object"></a>Tag Object</h3></div></div></div><p>A tag object contains an object, object type, tag name, the name of the
 person ("tagger") who created the tag, and a message, which may contain
-a signature, as can be seen using <a class="ulink" href="git-cat-file.html" target="_top">git-cat-file(1)</a>:</p><pre class="literallayout">$ git cat-file tag v1.5.0
+a signature, as can be seen using <a class="ulink" href="git-cat-file.html" target="_top">git-cat-file(1)</a>:</p><pre class="screen">$ git cat-file tag v1.5.0
 object 437b1b20df4b356c9342dac8d38849f24ef44f27
 type commit
 tag v1.5.0
@@ -1387,23 +1387,23 @@ objects.  (Note that <a class="ulink" href="git-tag.html" target="_top">git-tag(
 "lightweight tags", which are not tag objects at all, but just simple
 references whose names begin with <code class="literal">refs/tags/</code>).</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="pack-files"></a>How Git stores objects efficiently: pack files</h3></div></div></div><p>Newly created objects are initially created in a file named after the
 object’s SHA-1 hash (stored in <code class="literal">.git/objects</code>).</p><p>Unfortunately this system becomes inefficient once a project has a
-lot of objects.  Try this on an old project:</p><pre class="literallayout">$ git count-objects
+lot of objects.  Try this on an old project:</p><pre class="screen">$ git count-objects
 6930 objects, 47620 kilobytes</pre><p>The first number is the number of objects which are kept in
 individual files.  The second is the amount of space taken up by
 those "loose" objects.</p><p>You can save space and make Git faster by moving these loose objects in
 to a "pack file", which stores a group of objects in an efficient
 compressed format; the details of how pack files are formatted can be
-found in <a class="ulink" href="technical/pack-format.html" target="_top">pack format</a>.</p><p>To put the loose objects into a pack, just run git repack:</p><pre class="literallayout">$ git repack
+found in <a class="ulink" href="technical/pack-format.html" target="_top">pack format</a>.</p><p>To put the loose objects into a pack, just run git repack:</p><pre class="screen">$ git repack
 Counting objects: 6020, done.
 Delta compression using up to 4 threads.
 Compressing objects: 100% (6020/6020), done.
 Writing objects: 100% (6020/6020), done.
 Total 6020 (delta 4070), reused 0 (delta 0)</pre><p>This creates a single "pack file" in .git/objects/pack/
-containing all currently unpacked objects.  You can then run</p><pre class="literallayout">$ git prune</pre><p>to remove any of the "loose" objects that are now contained in the
+containing all currently unpacked objects.  You can then run</p><pre class="screen">$ git prune</pre><p>to remove any of the "loose" objects that are now contained in the
 pack.  This will also remove any unreferenced objects (which may be
 created when, for example, you use <code class="literal">git reset</code> to remove a commit).
 You can verify that the loose objects are gone by looking at the
-<code class="literal">.git/objects</code> directory or by running</p><pre class="literallayout">$ git count-objects
+<code class="literal">.git/objects</code> directory or by running</p><pre class="screen">$ git count-objects
 0 objects, 0 kilobytes</pre><p>Although the object files are gone, any commands that refer to those
 objects will work exactly as they did before.</p><p>The <a class="ulink" href="git-gc.html" target="_top">git-gc(1)</a> command performs packing, pruning, and more for
 you, so is normally the only high-level command you need.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="dangling-objects"></a>Dangling objects</h3></div></div></div><p>The <a class="ulink" href="git-fsck.html" target="_top">git-fsck(1)</a> command will sometimes complain about dangling
@@ -1427,10 +1427,10 @@ up pointing to them, so they end up "dangling" in your repository.</p><p>General
 even be very useful: if you screw something up, the dangling objects can
 be how you recover your old tree (say, you did a rebase, and realized
 that you really didn’t want to—you can look at what dangling objects
-you have, and decide to reset your head to some old dangling state).</p><p>For commits, you can just use:</p><pre class="literallayout">$ gitk &lt;dangling-commit-sha-goes-here&gt; --not --all</pre><p>This asks for all the history reachable from the given commit but not
+you have, and decide to reset your head to some old dangling state).</p><p>For commits, you can just use:</p><pre class="screen">$ gitk &lt;dangling-commit-sha-goes-here&gt; --not --all</pre><p>This asks for all the history reachable from the given commit but not
 from any branch, tag, or other reference.  If you decide it’s something
-you want, you can always create a new reference to it, e.g.,</p><pre class="literallayout">$ git branch recovered-branch &lt;dangling-commit-sha-goes-here&gt;</pre><p>For blobs and trees, you can’t do the same, but you can still examine
-them.  You can just do</p><pre class="literallayout">$ git show &lt;dangling-blob/tree-sha-goes-here&gt;</pre><p>to show what the contents of the blob were (or, for a tree, basically
+you want, you can always create a new reference to it, e.g.,</p><pre class="screen">$ git branch recovered-branch &lt;dangling-commit-sha-goes-here&gt;</pre><p>For blobs and trees, you can’t do the same, but you can still examine
+them.  You can just do</p><pre class="screen">$ git show &lt;dangling-blob/tree-sha-goes-here&gt;</pre><p>to show what the contents of the blob were (or, for a tree, basically
 what the <code class="literal">ls</code> for that directory was), and that may give you some idea
 of what the operation was that left that dangling object.</p><p>Usually, dangling blobs and trees aren’t very interesting. They’re
 almost always the result of either being a half-way mergebase (the blob
@@ -1439,7 +1439,7 @@ have had conflicting merges that you fixed up by hand), or simply
 because you interrupted a <code class="literal">git fetch</code> with ^C or something like that,
 leaving <span class="emphasis"><em>some</em></span> of the new objects in the object database, but just
 dangling and useless.</p><p>Anyway, once you are sure that you’re not interested in any dangling
-state, you can just prune all unreachable objects:</p><pre class="literallayout">$ git prune</pre><p>and they’ll be gone. (You should only run <code class="literal">git prune</code> on a quiescent
+state, you can just prune all unreachable objects:</p><pre class="screen">$ git prune</pre><p>and they’ll be gone. (You should only run <code class="literal">git prune</code> on a quiescent
 repository—it’s kind of like doing a filesystem fsck recovery: you
 don’t want to do that while the filesystem is mounted.
 <code class="literal">git prune</code> is designed not to cause any harm in such cases of concurrent
@@ -1452,7 +1452,7 @@ to replace them by hand.  Back up your repository before attempting this
 in case you corrupt things even more in the process.</p><p>We’ll assume that the problem is a single missing or corrupted blob,
 which is sometimes a solvable problem.  (Recovering missing trees and
 especially commits is <span class="strong"><strong>much</strong></span> harder).</p><p>Before starting, verify that there is corruption, and figure out where
-it is with <a class="ulink" href="git-fsck.html" target="_top">git-fsck(1)</a>; this may be time-consuming.</p><p>Assume the output looks like this:</p><pre class="literallayout">$ git fsck --full --no-dangling
+it is with <a class="ulink" href="git-fsck.html" target="_top">git-fsck(1)</a>; this may be time-consuming.</p><p>Assume the output looks like this:</p><pre class="screen">$ git fsck --full --no-dangling
 broken link from    tree 2d9263c6d23595e7cb2a21e5ebbb53655278dff8
               to    blob 4b9458b3786228369c63936db65827de3cc06200
 missing blob 4b9458b3786228369c63936db65827de3cc06200</pre><p>Now you know that blob 4b9458b3 is missing, and that the tree 2d9263c6
@@ -1460,7 +1460,7 @@ points to it.  If you could find just one copy of that missing blob
 object, possibly in some other repository, you could move it into
 <code class="literal">.git/objects/4b/9458b3...</code> and be done.  Suppose you can’t.  You can
 still examine the tree that pointed to it with <a class="ulink" href="git-ls-tree.html" target="_top">git-ls-tree(1)</a>,
-which might output something like:</p><pre class="literallayout">$ git ls-tree 2d9263c6d23595e7cb2a21e5ebbb53655278dff8
+which might output something like:</p><pre class="screen">$ git ls-tree 2d9263c6d23595e7cb2a21e5ebbb53655278dff8
 100644 blob 8d14531846b95bfa3564b58ccfb7913a034323b8    .gitignore
 100644 blob ebf9bf84da0aab5ed944264a5db2a65fe3a3e883    .mailmap
 100644 blob ca442d313d86dc67e0a2e5d584b465bd382cbf5c    COPYING
@@ -1471,11 +1471,11 @@ which might output something like:</p><pre class="literallayout">$ git ls-tree 2
 say it’s in <code class="literal">somedirectory</code>.  If you’re lucky the missing copy might be
 the same as the copy you have checked out in your working tree at
 <code class="literal">somedirectory/myfile</code>; you can test whether that’s right with
-<a class="ulink" href="git-hash-object.html" target="_top">git-hash-object(1)</a>:</p><pre class="literallayout">$ git hash-object -w somedirectory/myfile</pre><p>which will create and store a blob object with the contents of
+<a class="ulink" href="git-hash-object.html" target="_top">git-hash-object(1)</a>:</p><pre class="screen">$ git hash-object -w somedirectory/myfile</pre><p>which will create and store a blob object with the contents of
 somedirectory/myfile, and output the SHA-1 of that object.  if you’re
 extremely lucky it might be 4b9458b3786228369c63936db65827de3cc06200, in
 which case you’ve guessed right, and the corruption is fixed!</p><p>Otherwise, you need more information.  How do you tell which version of
-the file has been lost?</p><p>The easiest way to do this is with:</p><pre class="literallayout">$ git log --raw --all --full-history -- somedirectory/myfile</pre><p>Because you’re asking for raw output, you’ll now get something like</p><pre class="literallayout">commit abc
+the file has been lost?</p><p>The easiest way to do this is with:</p><pre class="screen">$ git log --raw --all --full-history -- somedirectory/myfile</pre><p>Because you’re asking for raw output, you’ll now get something like</p><pre class="screen">commit abc
 Author:
 Date:
 ...
@@ -1491,11 +1491,11 @@ Date:
 "newsha", and that the immediately preceding version was "oldsha".
 You also know the commit messages that went with the change from oldsha
 to 4b9458b and with the change from 4b9458b to newsha.</p><p>If you’ve been committing small enough changes, you may now have a good
-shot at reconstructing the contents of the in-between state 4b9458b.</p><p>If you can do that, you can now recreate the missing object with</p><pre class="literallayout">$ git hash-object -w &lt;recreated-file&gt;</pre><p>and your repository is good again!</p><p>(Btw, you could have ignored the <code class="literal">fsck</code>, and started with doing a</p><pre class="literallayout">$ git log --raw --all</pre><p>and just looked for the sha of the missing object (4b9458b) in that
+shot at reconstructing the contents of the in-between state 4b9458b.</p><p>If you can do that, you can now recreate the missing object with</p><pre class="screen">$ git hash-object -w &lt;recreated-file&gt;</pre><p>and your repository is good again!</p><p>(Btw, you could have ignored the <code class="literal">fsck</code>, and started with doing a</p><pre class="screen">$ git log --raw --all</pre><p>and just looked for the sha of the missing object (4b9458b) in that
 whole thing. It’s up to you—Git does <span class="strong"><strong>have</strong></span> a lot of information, it is
 just missing one particular blob version.</p></div></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="the-index"></a>The index</h2></div></div></div><p>The index is a binary file (generally kept in <code class="literal">.git/index</code>) containing a
 sorted list of path names, each with permissions and the SHA-1 of a blob
-object; <a class="ulink" href="git-ls-files.html" target="_top">git-ls-files(1)</a> can show you the contents of the index:</p><pre class="literallayout">$ git ls-files --stage
+object; <a class="ulink" href="git-ls-files.html" target="_top">git-ls-files(1)</a> can show you the contents of the index:</p><pre class="screen">$ git ls-files --stage
 100644 63c918c667fa005ff12ad89437f2fdc80926e21c 0       .gitignore
 100644 5529b198e8d14decbe4ad99db3f7fb632de0439d 0       .mailmap
 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 0       COPYING
@@ -1559,7 +1559,7 @@ clone none, some or all of the submodules.</p><p>The <a class="ulink" href="git-
 with Git 1.5.2 can look up the submodule commits in the repository and
 manually check them out; earlier versions won’t recognize the submodules at
 all.</p><p>To see how submodule support works, create four example
-repositories that can be used later as a submodule:</p><pre class="literallayout">$ mkdir ~/git
+repositories that can be used later as a submodule:</p><pre class="screen">$ mkdir ~/git
 $ cd ~/git
 $ for i in a b c d
 do
@@ -1570,13 +1570,13 @@ do
         git add $i.txt
         git commit -m "Initial commit, submodule $i"
         cd ..
-done</pre><p>Now create the superproject and add all the submodules:</p><pre class="literallayout">$ mkdir super
+done</pre><p>Now create the superproject and add all the submodules:</p><pre class="screen">$ mkdir super
 $ cd super
 $ git init
 $ for i in a b c d
 do
         git submodule add ~/git/$i $i
-done</pre><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Note</h3><p>Do not use local URLs here if you plan to publish your superproject!</p></div><p>See what files <code class="literal">git submodule</code> created:</p><pre class="literallayout">$ ls -a
+done</pre><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Note</h3><p>Do not use local URLs here if you plan to publish your superproject!</p></div><p>See what files <code class="literal">git submodule</code> created:</p><pre class="screen">$ ls -a
 .  ..  .git  .gitmodules  a  b  c  d</pre><p>The <code class="literal">git submodule add &lt;repo&gt; &lt;path&gt;</code> command does a couple of things:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
 It clones the submodule from <code class="literal">&lt;repo&gt;</code> to the given <code class="literal">&lt;path&gt;</code> under the
   current directory and by default checks out the master branch.
@@ -1586,9 +1586,9 @@ It adds the submodule’s clone path to the <a class="ulink" href="gitmodules.ht
 </li><li class="listitem">
 It adds the submodule’s current commit ID to the index, ready to be
   committed.
-</li></ul></div><p>Commit the superproject:</p><pre class="literallayout">$ git commit -m "Add submodules a, b, c and d."</pre><p>Now clone the superproject:</p><pre class="literallayout">$ cd ..
+</li></ul></div><p>Commit the superproject:</p><pre class="screen">$ git commit -m "Add submodules a, b, c and d."</pre><p>Now clone the superproject:</p><pre class="screen">$ cd ..
 $ git clone super cloned
-$ cd cloned</pre><p>The submodule directories are there, but they’re empty:</p><pre class="literallayout">$ ls -a a
+$ cd cloned</pre><p>The submodule directories are there, but they’re empty:</p><pre class="screen">$ ls -a a
 .  ..
 $ git submodule status
 -d266b9873ad50488163457f025db7cdd9683d88b a
@@ -1597,19 +1597,19 @@ $ git submodule status
 -d96249ff5d57de5de093e6baff9e0aafa5276a74 d</pre><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Note</h3><p>The commit object names shown above would be different for you, but they
 should match the HEAD commit object names of your repositories.  You can check
 it by running <code class="literal">git ls-remote ../a</code>.</p></div><p>Pulling down the submodules is a two-step process. First run <code class="literal">git submodule
-init</code> to add the submodule repository URLs to <code class="literal">.git/config</code>:</p><pre class="literallayout">$ git submodule init</pre><p>Now use <code class="literal">git submodule update</code> to clone the repositories and check out the
-commits specified in the superproject:</p><pre class="literallayout">$ git submodule update
+init</code> to add the submodule repository URLs to <code class="literal">.git/config</code>:</p><pre class="screen">$ git submodule init</pre><p>Now use <code class="literal">git submodule update</code> to clone the repositories and check out the
+commits specified in the superproject:</p><pre class="screen">$ git submodule update
 $ cd a
 $ ls -a
 .  ..  .git  a.txt</pre><p>One major difference between <code class="literal">git submodule update</code> and <code class="literal">git submodule add</code> is
 that <code class="literal">git submodule update</code> checks out a specific commit, rather than the tip
 of a branch. It’s like checking out a tag: the head is detached, so you’re not
-working on a branch.</p><pre class="literallayout">$ git branch
+working on a branch.</p><pre class="screen">$ git branch
 * (detached from d266b98)
   master</pre><p>If you want to make a change within a submodule and you have a detached head,
 then you should create or checkout a branch, make your changes, publish the
 change within the submodule, and then update the superproject to reference the
-new commit:</p><pre class="literallayout">$ git switch master</pre><p>or</p><pre class="literallayout">$ git switch -c fix-up</pre><p>then</p><pre class="literallayout">$ echo "adding a line again" &gt;&gt; a.txt
+new commit:</p><pre class="screen">$ git switch master</pre><p>or</p><pre class="screen">$ git switch -c fix-up</pre><p>then</p><pre class="screen">$ echo "adding a line again" &gt;&gt; a.txt
 $ git commit -a -m "Updated the submodule from within the superproject."
 $ git push
 $ cd ..
@@ -1626,7 +1626,7 @@ $ git commit -m "Updated submodule a."
 $ git push</pre><p>You have to run <code class="literal">git submodule update</code> after <code class="literal">git pull</code> if you want to update
 submodules, too.</p><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="pitfalls-with-submodules"></a>Pitfalls with submodules</h2></div></div></div><p>Always publish the submodule change before publishing the change to the
 superproject that references it. If you forget to publish the submodule change,
-others won’t be able to clone the repository:</p><pre class="literallayout">$ cd ~/git/super/a
+others won’t be able to clone the repository:</p><pre class="screen">$ cd ~/git/super/a
 $ echo i added another line to this file &gt;&gt; a.txt
 $ git commit -a -m "doing it wrong this time"
 $ cd ..
@@ -1644,7 +1644,7 @@ the submodule changes. Starting with Git 1.7.0 both <code class="literal">git st
 in the superproject show submodules as modified when they contain new or
 modified files to protect against accidentally committing such a state. <code class="literal">git
 diff</code> will also add a <code class="literal">-dirty</code> to the work tree side when generating patch
-output or used with the <code class="literal">--submodule</code> option:</p><pre class="literallayout">$ git diff
+output or used with the <code class="literal">--submodule</code> option:</p><pre class="screen">$ git diff
 diff --git a/sub b/sub
 --- a/sub
 +++ b/sub
@@ -1655,7 +1655,7 @@ $ git diff --submodule
 Submodule sub 3f35670..3f35670-dirty:</pre><p>You also should not rewind branches in a submodule beyond commits that were
 ever recorded in any superproject.</p><p>It’s not safe to run <code class="literal">git submodule update</code> if you’ve made and committed
 changes within a submodule without checking out a branch first. They will be
-silently overwritten:</p><pre class="literallayout">$ cat a.txt
+silently overwritten:</p><pre class="screen">$ cat a.txt
 module a
 $ echo line added from private2 &gt;&gt; a.txt
 $ git commit -a -m "line added inside private2"
@@ -1686,7 +1686,7 @@ the database or the working directory. Thus there are four main
 combinations:</p><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="working-directory-to-index"></a>working directory → index</h3></div></div></div><p>The <a class="ulink" href="git-update-index.html" target="_top">git-update-index(1)</a> command updates the index with
 information from the working directory.  You generally update the
 index information by just specifying the filename you want to update,
-like so:</p><pre class="literallayout">$ git update-index filename</pre><p>but to avoid common mistakes with filename globbing etc., the command
+like so:</p><pre class="screen">$ git update-index filename</pre><p>but to avoid common mistakes with filename globbing etc., the command
 will not normally add totally new entries or remove old entries,
 i.e. it will normally just update existing cache entries.</p><p>To tell Git that yes, you really do realize that certain files no
 longer exist, or that new files should be added, you
@@ -1700,14 +1700,14 @@ will refresh the "stat" information of each index to match the current
 stat information. It will <span class="emphasis"><em>not</em></span> update the object status itself, and
 it will only update the fields that are used to quickly test whether
 an object still matches its old backing store object.</p><p>The previously introduced <a class="ulink" href="git-add.html" target="_top">git-add(1)</a> is just a wrapper for
-<a class="ulink" href="git-update-index.html" target="_top">git-update-index(1)</a>.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="index-to-object-database"></a>index → object database</h3></div></div></div><p>You write your current index file to a "tree" object with the program</p><pre class="literallayout">$ git write-tree</pre><p>that doesn’t come with any options—it will just write out the
+<a class="ulink" href="git-update-index.html" target="_top">git-update-index(1)</a>.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="index-to-object-database"></a>index → object database</h3></div></div></div><p>You write your current index file to a "tree" object with the program</p><pre class="screen">$ git write-tree</pre><p>that doesn’t come with any options—it will just write out the
 current index into the set of tree objects that describe that state,
 and it will return the name of the resulting top-level tree. You can
 use that tree to re-generate the index at any time by going in the
 other direction:</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="object-database-to-index"></a>object database → index</h3></div></div></div><p>You read a "tree" file from the object database, and use that to
 populate (and overwrite—don’t do this if your index contains any
 unsaved state that you might want to restore later!) your current
-index.  Normal operation is just</p><pre class="literallayout">$ git read-tree &lt;SHA-1 of tree&gt;</pre><p>and your index file will now be equivalent to the tree that you saved
+index.  Normal operation is just</p><pre class="screen">$ git read-tree &lt;SHA-1 of tree&gt;</pre><p>and your index file will now be equivalent to the tree that you saved
 earlier. However, that is only your <span class="emphasis"><em>index</em></span> file: your working
 directory contents have not been modified.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="index-to-working-directory"></a>index → working directory</h3></div></div></div><p>You update your working directory from the index by "checking out"
 files. This is not a very common operation, since normally you’d just
@@ -1716,7 +1716,7 @@ directory, you’d tell the index files about the changes in your
 working directory (i.e. <code class="literal">git update-index</code>).</p><p>However, if you decide to jump to a new version, or check out somebody
 else’s version, or just restore a previous tree, you’d populate your
 index file with read-tree, and then you need to check out the result
-with</p><pre class="literallayout">$ git checkout-index filename</pre><p>or, if you want to check out all of the index, use <code class="literal">-a</code>.</p><p>NOTE! <code class="literal">git checkout-index</code> normally refuses to overwrite old files, so
+with</p><pre class="screen">$ git checkout-index filename</pre><p>or, if you want to check out all of the index, use <code class="literal">-a</code>.</p><p>NOTE! <code class="literal">git checkout-index</code> normally refuses to overwrite old files, so
 if you have an old version of the tree already checked out, you will
 need to use the <code class="literal">-f</code> flag (<span class="emphasis"><em>before</em></span> the <code class="literal">-a</code> flag or the filename) to
 <span class="emphasis"><em>force</em></span> the checkout.</p><p>Finally, there are a few odds and ends which are not purely moving
@@ -1730,13 +1730,13 @@ fact that such a commit brings together ("merges") two or more
 previous states represented by other commits.</p><p>In other words, while a "tree" represents a particular directory state
 of a working directory, a "commit" represents that state in time,
 and explains how we got there.</p><p>You create a commit object by giving it the tree that describes the
-state at the time of the commit, and a list of parents:</p><pre class="literallayout">$ git commit-tree &lt;tree&gt; -p &lt;parent&gt; [(-p &lt;parent2&gt;)...]</pre><p>and then giving the reason for the commit on stdin (either through
+state at the time of the commit, and a list of parents:</p><pre class="screen">$ git commit-tree &lt;tree&gt; -p &lt;parent&gt; [(-p &lt;parent2&gt;)...]</pre><p>and then giving the reason for the commit on stdin (either through
 redirection from a pipe or file, or by just typing it at the tty).</p><p><code class="literal">git commit-tree</code> will return the name of the object that represents
 that commit, and you should save it away for later use. Normally,
 you’d commit a new <code class="literal">HEAD</code> state, and while Git doesn’t care where you
 save the note about that state, in practice we tend to just write the
 result to the file pointed at by <code class="literal">.git/HEAD</code>, so that we can always see
-what the last committed state was.</p><p>Here is a picture that illustrates how various pieces fit together:</p><pre class="literallayout">                     commit-tree
+what the last committed state was.</p><p>Here is a picture that illustrates how various pieces fit together:</p><pre class="screen">                     commit-tree
                       commit obj
                        +----+
                        |    |
@@ -1769,30 +1769,30 @@ what the last committed state was.</p><p>Here is a picture that illustrates how
                     +-----------+</pre></div></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="examining-the-data"></a>Examining the data</h2></div></div></div><p>You can examine the data represented in the object database and the
 index with various helper tools. For every object, you can use
 <a class="ulink" href="git-cat-file.html" target="_top">git-cat-file(1)</a> to examine details about the
-object:</p><pre class="literallayout">$ git cat-file -t &lt;objectname&gt;</pre><p>shows the type of the object, and once you have the type (which is
-usually implicit in where you find the object), you can use</p><pre class="literallayout">$ git cat-file blob|tree|commit|tag &lt;objectname&gt;</pre><p>to show its contents. NOTE! Trees have binary content, and as a result
+object:</p><pre class="screen">$ git cat-file -t &lt;objectname&gt;</pre><p>shows the type of the object, and once you have the type (which is
+usually implicit in where you find the object), you can use</p><pre class="screen">$ git cat-file blob|tree|commit|tag &lt;objectname&gt;</pre><p>to show its contents. NOTE! Trees have binary content, and as a result
 there is a special helper for showing that content, called
 <code class="literal">git ls-tree</code>, which turns the binary content into a more easily
 readable form.</p><p>It’s especially instructive to look at "commit" objects, since those
 tend to be small and fairly self-explanatory. In particular, if you
 follow the convention of having the top commit name in <code class="literal">.git/HEAD</code>,
-you can do</p><pre class="literallayout">$ git cat-file commit HEAD</pre><p>to see what the top commit was.</p></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="merging-multiple-trees"></a>Merging multiple trees</h2></div></div></div><p>Git can help you perform a three-way merge, which can in turn be
+you can do</p><pre class="screen">$ git cat-file commit HEAD</pre><p>to see what the top commit was.</p></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="merging-multiple-trees"></a>Merging multiple trees</h2></div></div></div><p>Git can help you perform a three-way merge, which can in turn be
 used for a many-way merge by repeating the merge procedure several
 times.  The usual situation is that you only do one three-way merge
 (reconciling two lines of history) and commit the result, but if
 you like to, you can merge several branches in one go.</p><p>To perform a three-way merge, you start with the two commits you
 want to merge, find their closest common parent (a third commit),
 and compare the trees corresponding to these three commits.</p><p>To get the "base" for the merge, look up the common parent of two
-commits:</p><pre class="literallayout">$ git merge-base &lt;commit1&gt; &lt;commit2&gt;</pre><p>This prints the name of a commit they are both based on. You should
+commits:</p><pre class="screen">$ git merge-base &lt;commit1&gt; &lt;commit2&gt;</pre><p>This prints the name of a commit they are both based on. You should
 now look up the tree objects of those commits, which you can easily
-do with</p><pre class="literallayout">$ git cat-file commit &lt;commitname&gt; | head -1</pre><p>since the tree object information is always the first line in a commit
+do with</p><pre class="screen">$ git cat-file commit &lt;commitname&gt; | head -1</pre><p>since the tree object information is always the first line in a commit
 object.</p><p>Once you know the three trees you are going to merge (the one "original"
 tree, aka the common tree, and the two "result" trees, aka the branches
 you want to merge), you do a "merge" read into the index. This will
 complain if it has to throw away your old index contents, so you should
 make sure that you’ve committed those—in fact you would normally
 always do a merge against your last commit (which should thus match what
-you have in your current index anyway).</p><p>To do the merge, do</p><pre class="literallayout">$ git read-tree -m -u &lt;origtree&gt; &lt;yourtree&gt; &lt;targettree&gt;</pre><p>which will do all trivial merge operations for you directly in the
+you have in your current index anyway).</p><p>To do the merge, do</p><pre class="screen">$ git read-tree -m -u &lt;origtree&gt; &lt;yourtree&gt; &lt;targettree&gt;</pre><p>which will do all trivial merge operations for you directly in the
 index file, and you can just write the result out with
 <code class="literal">git write-tree</code>.</p></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="merging-multiple-trees-2"></a>Merging multiple trees, continued</h2></div></div></div><p>Sadly, many merges aren’t trivial. If there are files that have
 been added, moved or removed, or if both branches have modified the
@@ -1800,7 +1800,7 @@ same file, you will be left with an index tree that contains "merge
 entries" in it. Such an index tree can <span class="emphasis"><em>NOT</em></span> be written out to a tree
 object, and you will have to resolve any such merge clashes using
 other tools before you can write out the result.</p><p>You can examine such index state with <code class="literal">git ls-files --unmerged</code>
-command.  An example:</p><pre class="literallayout">$ git read-tree -m $orig HEAD $target
+command.  An example:</p><pre class="screen">$ git read-tree -m $orig HEAD $target
 $ git ls-files --unmerged
 100644 263414f423d0e4d70dae8fe53fa34614ff3e2860 1       hello.c
 100644 06fa6a24256dc7e560efa5687fa84b51f0263c3a 2       hello.c
@@ -1817,19 +1817,19 @@ above example shows is that file <code class="literal">hello.c</code> was change
 <code class="literal">$orig</code> to <code class="literal">HEAD</code> and <code class="literal">$orig</code> to <code class="literal">$target</code> in a different way.
 You could resolve this by running your favorite 3-way merge
 program, e.g.  <code class="literal">diff3</code>, <code class="literal">merge</code>, or Git’s own merge-file, on
-the blob objects from these three stages yourself, like this:</p><pre class="literallayout">$ git cat-file blob 263414f &gt;hello.c~1
+the blob objects from these three stages yourself, like this:</p><pre class="screen">$ git cat-file blob 263414f &gt;hello.c~1
 $ git cat-file blob 06fa6a2 &gt;hello.c~2
 $ git cat-file blob cc44c73 &gt;hello.c~3
 $ git merge-file hello.c~2 hello.c~1 hello.c~3</pre><p>This would leave the merge result in <code class="literal">hello.c~2</code> file, along
 with conflict markers if there are conflicts.  After verifying
 the merge result makes sense, you can tell Git what the final
-merge result for this file is by:</p><pre class="literallayout">$ mv -f hello.c~2 hello.c
+merge result for this file is by:</p><pre class="screen">$ mv -f hello.c~2 hello.c
 $ git update-index hello.c</pre><p>When a path is in the "unmerged" state, running <code class="literal">git update-index</code> for
 that path tells Git to mark the path resolved.</p><p>The above is the description of a Git merge at the lowest level,
 to help you understand what conceptually happens under the hood.
 In practice, nobody, not even Git itself, runs <code class="literal">git cat-file</code> three times
 for this.  There is a <code class="literal">git merge-index</code> program that extracts the
-stages to temporary files and calls a "merge" script on it:</p><pre class="literallayout">$ git merge-index git-merge-one-file hello.c</pre><p>and that is what higher level <code class="literal">git merge -s resolve</code> is implemented with.</p></div></div><div class="chapter"><div class="titlepage"><div><div><h1 class="title"><a name="hacking-git"></a>Chapter 10. Hacking Git</h1></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl class="toc"><dt><span class="section"><a href="#object-details">Object storage format</a></span></dt><dt><span class="section"><a href="#birdview-on-the-source-code">A birds-eye view of Git’s source code</a></span></dt></dl></div><p>This chapter covers internal details of the Git implementation which
+stages to temporary files and calls a "merge" script on it:</p><pre class="screen">$ git merge-index git-merge-one-file hello.c</pre><p>and that is what higher level <code class="literal">git merge -s resolve</code> is implemented with.</p></div></div><div class="chapter"><div class="titlepage"><div><div><h1 class="title"><a name="hacking-git"></a>Chapter 10. Hacking Git</h1></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl class="toc"><dt><span class="section"><a href="#object-details">Object storage format</a></span></dt><dt><span class="section"><a href="#birdview-on-the-source-code">A birds-eye view of Git’s source code</a></span></dt></dl></div><p>This chapter covers internal details of the Git implementation which
 probably only Git developers need to understand.</p><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="object-details"></a>Object storage format</h2></div></div></div><p>All objects have a statically determined "type" which identifies the
 format of the object (i.e. how it is used, and how it can refer to other
 objects).  There are currently four different object types: "blob",
@@ -1851,7 +1851,7 @@ the <code class="literal">git fsck</code> program, which generates a full depend
 of all objects, and verifies their internal consistency (in addition
 to just verifying their superficial consistency through the hash).</p></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="birdview-on-the-source-code"></a>A birds-eye view of Git’s source code</h2></div></div></div><p>It is not always easy for new developers to find their way through Git’s
 source code.  This section gives you a little guidance to show where to
-start.</p><p>A good place to start is with the contents of the initial commit, with:</p><pre class="literallayout">$ git switch --detach e83c5163</pre><p>The initial revision lays the foundation for almost everything Git has
+start.</p><p>A good place to start is with the contents of the initial commit, with:</p><pre class="screen">$ git switch --detach e83c5163</pre><p>The initial revision lays the foundation for almost everything Git has
 today, but is small enough to read in one sitting.</p><p>Note that terminology has changed since that revision.  For example, the
 README in that revision uses the word "changeset" to describe what we
 now call a <a class="link" href="#def_commit_object">commit</a>.</p><p>Also, we do not call it "cache" any more, but rather "index"; however, the
@@ -1874,7 +1874,7 @@ There are quite a few ways to name an object (and not only revisions!).
 All of these are handled in <code class="literal">sha1_name.c</code>. Just have a quick look at
 the function <code class="literal">get_sha1()</code>. A lot of the special handling is done by
 functions like <code class="literal">get_sha1_basic()</code> or the likes.</p><p>This is just to get you into the groove for the most libified part of Git:
-the revision walker.</p><p>Basically, the initial version of <code class="literal">git log</code> was a shell script:</p><pre class="literallayout">$ git-rev-list --pretty $(git-rev-parse --default HEAD "$@") | \
+the revision walker.</p><p>Basically, the initial version of <code class="literal">git log</code> was a shell script:</p><pre class="screen">$ git-rev-list --pretty $(git-rev-parse --default HEAD "$@") | \
         LESS=-S ${PAGER:-less}</pre><p>What does this mean?</p><p><code class="literal">git rev-list</code> is the original version of the revision walker, which
 <span class="emphasis"><em>always</em></span> printed a list of revisions to stdout.  It is still functional,
 and needs to, since most new Git commands start out as scripts using
@@ -1916,7 +1916,7 @@ was around even in the initial commit (it literally went only through
   some 20 revisions as <code class="literal">cat-file.c</code>, was renamed to <code class="literal">builtin/cat-file.c</code>
   when made a builtin, and then saw less than 10 versions).
 </li></ul></div><p>So, look into <code class="literal">builtin/cat-file.c</code>, search for <code class="literal">cmd_cat_file()</code> and look what
-it does.</p><pre class="literallayout">        git_config(git_default_config);
+it does.</p><pre class="screen">        git_config(git_default_config);
         if (argc != 3)
                 usage("git cat-file [-t|-s|-e|-p|&lt;type&gt;] &lt;sha1&gt;");
         if (get_sha1(argv[2], sha1))
@@ -1934,19 +1934,19 @@ the variable <code class="literal">sha1</code> in the function signature of <cod
   commit.  Note that whenever a SHA-1 is passed as <code class="literal">unsigned char *</code>, it
   is the binary representation, as opposed to the ASCII representation in
   hex characters, which is passed as <code class="literal">char *</code>.
-</li></ul></div><p>You will see both of these things throughout the code.</p><p>Now, for the meat:</p><pre class="literallayout">        case 0:
+</li></ul></div><p>You will see both of these things throughout the code.</p><p>Now, for the meat:</p><pre class="screen">        case 0:
                 buf = read_object_with_reference(sha1, argv[1], &amp;size, NULL);</pre><p>This is how you read a blob (actually, not only a blob, but any type of
 object).  To know how the function <code class="literal">read_object_with_reference()</code> actually
 works, find the source code for it (something like <code class="literal">git grep
 read_object_with | grep ":[a-z]"</code> in the Git repository), and read
-the source.</p><p>To find out how the result can be used, just read on in <code class="literal">cmd_cat_file()</code>:</p><pre class="literallayout">        write_or_die(1, buf, size);</pre><p>Sometimes, you do not know where to look for a feature.  In many such cases,
+the source.</p><p>To find out how the result can be used, just read on in <code class="literal">cmd_cat_file()</code>:</p><pre class="screen">        write_or_die(1, buf, size);</pre><p>Sometimes, you do not know where to look for a feature.  In many such cases,
 it helps to search through the output of <code class="literal">git log</code>, and then <code class="literal">git show</code> the
 corresponding commit.</p><p>Example: If you know that there was some test case for <code class="literal">git bundle</code>, but
 do not remember where it was (yes, you <span class="emphasis"><em>could</em></span> <code class="literal">git grep bundle t/</code>, but that
-does not illustrate the point!):</p><pre class="literallayout">$ git log --no-merges t/</pre><p>In the pager (<code class="literal">less</code>), just search for "bundle", go a few lines back,
+does not illustrate the point!):</p><pre class="screen">$ git log --no-merges t/</pre><p>In the pager (<code class="literal">less</code>), just search for "bundle", go a few lines back,
 and see that it is in commit 18449ab0.  Now just copy this object name,
-and paste it into the command line</p><pre class="literallayout">$ git show 18449ab0</pre><p>Voila.</p><p>Another example: Find out what to do in order to make some script a
-builtin:</p><pre class="literallayout">$ git log --no-merges --diff-filter=A builtin/*.c</pre><p>You see, Git is actually the best tool to find out about the source of Git
+and paste it into the command line</p><pre class="screen">$ git show 18449ab0</pre><p>Voila.</p><p>Another example: Find out what to do in order to make some script a
+builtin:</p><pre class="screen">$ git log --no-merges --diff-filter=A builtin/*.c</pre><p>You see, Git is actually the best tool to find out about the source of Git
 itself!</p></div></div><div class="chapter"><div class="titlepage"><div><div><h1 class="title"><a name="glossary"></a>Chapter 11. Git Glossary</h1></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl class="toc"><dt><span class="section"><a href="#git-explained">Git explained</a></span></dt></dl></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="git-explained"></a>Git explained</h2></div></div></div><div class="variablelist"><dl class="variablelist"><dt><span class="term">
 <a name="def_alternate_object_database"></a>alternate object database
 </span></dt><dd>
@@ -2672,27 +2672,27 @@ The most notable example is <code class="literal">HEAD</code>.</p></dd><dt><span
         contains the contents of the <a class="link" href="#def_HEAD">HEAD</a> commit’s tree,
         plus any local changes that you have made but not yet committed.
 </dd></dl></div></div></div><div class="appendix"><div class="titlepage"><div><div><h1 class="title"><a name="git-quick-start"></a>Appendix A. Git Quick Reference</h1></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl class="toc"><dt><span class="section"><a href="#quick-creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#managing-branches">Managing branches</a></span></dt><dt><span class="section"><a href="#exploring-history">Exploring history</a></span></dt><dt><span class="section"><a href="#making-changes">Making changes</a></span></dt><dt><span class="section"><a href="#merging">Merging</a></span></dt><dt><span class="section"><a href="#sharing-your-changes">Sharing your changes</a></span></dt><dt><span class="section"><a href="#repository-maintenance">Repository maintenance</a></span></dt></dl></div><p>This is a quick summary of the major commands; the previous chapters
-explain how these work in more detail.</p><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="quick-creating-a-new-repository"></a>Creating a new repository</h2></div></div></div><p>From a tarball:</p><pre class="literallayout">$ tar xzf project.tar.gz
+explain how these work in more detail.</p><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="quick-creating-a-new-repository"></a>Creating a new repository</h2></div></div></div><p>From a tarball:</p><pre class="screen">$ tar xzf project.tar.gz
 $ cd project
 $ git init
 Initialized empty Git repository in .git/
 $ git add .
-$ git commit</pre><p>From a remote repository:</p><pre class="literallayout">$ git clone git://example.com/pub/project.git
-$ cd project</pre></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="managing-branches"></a>Managing branches</h2></div></div></div><pre class="literallayout">$ git branch                    # list all local branches in this repo
+$ git commit</pre><p>From a remote repository:</p><pre class="screen">$ git clone git://example.com/pub/project.git
+$ cd project</pre></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="managing-branches"></a>Managing branches</h2></div></div></div><pre class="screen">$ git branch                    # list all local branches in this repo
 $ git switch test               # switch working directory to branch "test"
 $ git branch new                # create branch "new" starting at current HEAD
-$ git branch -d new             # delete branch "new"</pre><p>Instead of basing a new branch on current HEAD (the default), use:</p><pre class="literallayout">$ git branch new test    # branch named "test"
+$ git branch -d new             # delete branch "new"</pre><p>Instead of basing a new branch on current HEAD (the default), use:</p><pre class="screen">$ git branch new test    # branch named "test"
 $ git branch new v2.6.15 # tag named v2.6.15
 $ git branch new HEAD^   # commit before the most recent
 $ git branch new HEAD^^  # commit before that
-$ git branch new test~10 # ten commits before tip of branch "test"</pre><p>Create and switch to a new branch at the same time:</p><pre class="literallayout">$ git switch -c new v2.6.15</pre><p>Update and examine branches from the repository you cloned from:</p><pre class="literallayout">$ git fetch             # update
+$ git branch new test~10 # ten commits before tip of branch "test"</pre><p>Create and switch to a new branch at the same time:</p><pre class="screen">$ git switch -c new v2.6.15</pre><p>Update and examine branches from the repository you cloned from:</p><pre class="screen">$ git fetch             # update
 $ git branch -r         # list
   origin/master
   origin/next
   ...
 $ git switch -c masterwork origin/master</pre><p>Fetch a branch from a different repository, and give it a new
-name in your repository:</p><pre class="literallayout">$ git fetch git://example.com/project.git theirbranch:mybranch
-$ git fetch git://example.com/project.git v2.6.15:mybranch</pre><p>Keep a list of repositories you work with regularly:</p><pre class="literallayout">$ git remote add example git://example.com/project.git
+name in your repository:</p><pre class="screen">$ git fetch git://example.com/project.git theirbranch:mybranch
+$ git fetch git://example.com/project.git v2.6.15:mybranch</pre><p>Keep a list of repositories you work with regularly:</p><pre class="screen">$ git remote add example git://example.com/project.git
 $ git remote                    # list remote repositories
 example
 origin
@@ -2704,7 +2704,7 @@ $ git remote show example       # get details
     next
     ...
 $ git fetch example             # update branches from example
-$ git branch -r                 # list all remote branches</pre></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="exploring-history"></a>Exploring history</h2></div></div></div><pre class="literallayout">$ gitk                      # visualize and browse history
+$ git branch -r                 # list all remote branches</pre></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="exploring-history"></a>Exploring history</h2></div></div></div><pre class="screen">$ gitk                      # visualize and browse history
 $ git log                   # list all commits
 $ git log src/              # ...modifying src/
 $ git log v2.6.15..v2.6.16  # ...in v2.6.16, not in v2.6.15
@@ -2719,32 +2719,32 @@ $ git diff v2.6.15..v2.6.16 # diff between two tagged versions
 $ git diff v2.6.15..HEAD    # diff with current head
 $ git grep "foo()"          # search working directory for "foo()"
 $ git grep v2.6.15 "foo()"  # search old tree for "foo()"
-$ git show v2.6.15:a.txt    # look at old version of a.txt</pre><p>Search for regressions:</p><pre class="literallayout">$ git bisect start
+$ git show v2.6.15:a.txt    # look at old version of a.txt</pre><p>Search for regressions:</p><pre class="screen">$ git bisect start
 $ git bisect bad                # current version is bad
 $ git bisect good v2.6.13-rc2   # last known good revision
 Bisecting: 675 revisions left to test after this
                                 # test here, then:
 $ git bisect good               # if this revision is good, or
 $ git bisect bad                # if this revision is bad.
-                                # repeat until done.</pre></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="making-changes"></a>Making changes</h2></div></div></div><p>Make sure Git knows who to blame:</p><pre class="literallayout">$ cat &gt;&gt;~/.gitconfig &lt;&lt;\EOF
+                                # repeat until done.</pre></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="making-changes"></a>Making changes</h2></div></div></div><p>Make sure Git knows who to blame:</p><pre class="screen">$ cat &gt;&gt;~/.gitconfig &lt;&lt;\EOF
 [user]
         name = Your Name Comes Here
         email = you@yourdomain.example.com
 EOF</pre><p>Select file contents to include in the next commit, then make the
-commit:</p><pre class="literallayout">$ git add a.txt    # updated file
+commit:</p><pre class="screen">$ git add a.txt    # updated file
 $ git add b.txt    # new file
 $ git rm c.txt     # old file
-$ git commit</pre><p>Or, prepare and create the commit in one step:</p><pre class="literallayout">$ git commit d.txt # use latest content only of d.txt
-$ git commit -a    # use latest content of all tracked files</pre></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="merging"></a>Merging</h2></div></div></div><pre class="literallayout">$ git merge test   # merge branch "test" into the current branch
+$ git commit</pre><p>Or, prepare and create the commit in one step:</p><pre class="screen">$ git commit d.txt # use latest content only of d.txt
+$ git commit -a    # use latest content of all tracked files</pre></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="merging"></a>Merging</h2></div></div></div><pre class="screen">$ git merge test   # merge branch "test" into the current branch
 $ git pull git://example.com/project.git master
                    # fetch and merge in remote branch
-$ git pull . test  # equivalent to git merge test</pre></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="sharing-your-changes"></a>Sharing your changes</h2></div></div></div><p>Importing or exporting patches:</p><pre class="literallayout">$ git format-patch origin..HEAD # format a patch for each commit
+$ git pull . test  # equivalent to git merge test</pre></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="sharing-your-changes"></a>Sharing your changes</h2></div></div></div><p>Importing or exporting patches:</p><pre class="screen">$ git format-patch origin..HEAD # format a patch for each commit
                                 # in HEAD but not in origin
 $ git am mbox # import patches from the mailbox "mbox"</pre><p>Fetch a branch in a different Git repository, then merge into the
-current branch:</p><pre class="literallayout">$ git pull git://example.com/project.git theirbranch</pre><p>Store the fetched branch into a local branch before merging into the
-current branch:</p><pre class="literallayout">$ git pull git://example.com/project.git theirbranch:mybranch</pre><p>After creating commits on a local branch, update the remote
-branch with your commits:</p><pre class="literallayout">$ git push ssh://example.com/project.git mybranch:theirbranch</pre><p>When remote and local branch are both named "test":</p><pre class="literallayout">$ git push ssh://example.com/project.git test</pre><p>Shortcut version for a frequently used remote repository:</p><pre class="literallayout">$ git remote add example ssh://example.com/project.git
-$ git push example test</pre></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="repository-maintenance"></a>Repository maintenance</h2></div></div></div><p>Check for corruption:</p><pre class="literallayout">$ git fsck</pre><p>Recompress, remove unused cruft:</p><pre class="literallayout">$ git gc</pre></div></div><div class="appendix"><div class="titlepage"><div><div><h1 class="title"><a name="todo"></a>Appendix B. Notes and todo list for this manual</h1></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl class="toc"><dt><span class="section"><a href="#todo-list">Todo list</a></span></dt></dl></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="todo-list"></a>Todo list</h2></div></div></div><p>This is a work in progress.</p><p>The basic requirements:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
+current branch:</p><pre class="screen">$ git pull git://example.com/project.git theirbranch</pre><p>Store the fetched branch into a local branch before merging into the
+current branch:</p><pre class="screen">$ git pull git://example.com/project.git theirbranch:mybranch</pre><p>After creating commits on a local branch, update the remote
+branch with your commits:</p><pre class="screen">$ git push ssh://example.com/project.git mybranch:theirbranch</pre><p>When remote and local branch are both named "test":</p><pre class="screen">$ git push ssh://example.com/project.git test</pre><p>Shortcut version for a frequently used remote repository:</p><pre class="screen">$ git remote add example ssh://example.com/project.git
+$ git push example test</pre></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="repository-maintenance"></a>Repository maintenance</h2></div></div></div><p>Check for corruption:</p><pre class="screen">$ git fsck</pre><p>Recompress, remove unused cruft:</p><pre class="screen">$ git gc</pre></div></div><div class="appendix"><div class="titlepage"><div><div><h1 class="title"><a name="todo"></a>Appendix B. Notes and todo list for this manual</h1></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl class="toc"><dt><span class="section"><a href="#todo-list">Todo list</a></span></dt></dl></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="todo-list"></a>Todo list</h2></div></div></div><p>This is a work in progress.</p><p>The basic requirements:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
 It must be readable in order, from beginning to end, by someone
   intelligent with a basic grasp of the UNIX command line, but without
   any special knowledge of Git.  If necessary, any other prerequisites