diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-12-18 16:43:11 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-12-18 16:43:11 -0800 |
| commit | 9d9711544dc3090db6e5c52f9ce9c300bf4f5c14 (patch) | |
| tree | 23257b9801739fd96c9e82ef98a17500dce9f88e /gittutorial.html | |
| parent | 9629d4f49e5ffcff5c5beb5c40bedcffcabcd905 (diff) | |
| download | git-htmldocs-9d9711544dc3090db6e5c52f9ce9c300bf4f5c14.tar.gz | |
Autogenerated HTML docs for v1.8.1-rc2-5-g252f9
Diffstat (limited to 'gittutorial.html')
| -rw-r--r-- | gittutorial.html | 568 |
1 files changed, 377 insertions, 191 deletions
diff --git a/gittutorial.html b/gittutorial.html index 8b7e1b855..2d55f4539 100644 --- a/gittutorial.html +++ b/gittutorial.html @@ -2,15 +2,25 @@ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.5.2" />
+<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
+<meta name="generator" content="AsciiDoc 8.6.8" />
<title>gittutorial(7)</title>
<style type="text/css">
-/* Debug borders */
-p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
-/*
- border: 1px solid red;
-*/
+/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
+
+/* Default font. */
+body {
+ font-family: Georgia,serif;
+}
+
+/* Title font. */
+h1, h2, h3, h4, h5, h6,
+div.title, caption.title,
+thead, p.table.header,
+#toctitle,
+#author, #revnumber, #revdate, #revremark,
+#footer {
+ font-family: Arial,Helvetica,sans-serif;
}
body {
@@ -35,13 +45,8 @@ strong { color: #083194;
}
-tt {
- color: navy;
-}
-
h1, h2, h3, h4, h5, h6 {
color: #527bbd;
- font-family: sans-serif;
margin-top: 1.2em;
margin-bottom: 0.5em;
line-height: 1.3;
@@ -59,9 +64,11 @@ h3 { h3 + * {
clear: left;
}
+h5 {
+ font-size: 1.0em;
+}
div.sectionbody {
- font-family: serif;
margin-left: 0;
}
@@ -77,45 +84,48 @@ p { ul, ol, li > p {
margin-top: 0;
}
+ul > li { color: #aaa; }
+ul > li > * { color: black; }
-pre {
+.monospaced, code, pre {
+ font-family: "Courier New", Courier, monospace;
+ font-size: inherit;
+ color: navy;
padding: 0;
margin: 0;
}
-span#author {
+
+#author {
color: #527bbd;
- font-family: sans-serif;
font-weight: bold;
font-size: 1.1em;
}
-span#email {
+#email {
}
-span#revnumber, span#revdate, span#revremark {
- font-family: sans-serif;
+#revnumber, #revdate, #revremark {
}
-div#footer {
- font-family: sans-serif;
+#footer {
font-size: small;
border-top: 2px solid silver;
padding-top: 0.5em;
margin-top: 4.0em;
}
-div#footer-text {
+#footer-text {
float: left;
padding-bottom: 0.5em;
}
-div#footer-badges {
+#footer-badges {
float: right;
padding-bottom: 0.5em;
}
-div#preamble {
+#preamble {
margin-top: 1.5em;
margin-bottom: 1.5em;
}
-div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
+div.imageblock, div.exampleblock, div.verseblock,
div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
div.admonitionblock {
margin-top: 1.0em;
@@ -135,7 +145,6 @@ div.content { /* Block element content. */ /* Block element titles. */
div.title, caption.title {
color: #527bbd;
- font-family: sans-serif;
font-weight: bold;
text-align: left;
margin-top: 1.0em;
@@ -157,13 +166,15 @@ div.content + div.title { div.sidebarblock > div.content {
background: #ffffee;
- border: 1px solid silver;
+ border: 1px solid #dddddd;
+ border-left: 4px solid #f0f0f0;
padding: 0.5em;
}
div.listingblock > div.content {
- border: 1px solid silver;
- background: #f4f4f4;
+ border: 1px solid #dddddd;
+ border-left: 5px solid #f0f0f0;
+ background: #f8f8f8;
padding: 0.5em;
}
@@ -171,8 +182,8 @@ div.quoteblock, div.verseblock { padding-left: 1.0em;
margin-left: 1.0em;
margin-right: 10%;
- border-left: 5px solid #dddddd;
- color: #777777;
+ border-left: 5px solid #f0f0f0;
+ color: #888;
}
div.quoteblock > div.attribution {
@@ -180,8 +191,9 @@ div.quoteblock > div.attribution { text-align: right;
}
-div.verseblock > div.content {
- white-space: pre;
+div.verseblock > pre.content {
+ font-family: inherit;
+ font-size: inherit;
}
div.verseblock > div.attribution {
padding-top: 0.75em;
@@ -254,35 +266,12 @@ div.compact div, div.compact div { margin-bottom: 0.1em;
}
-div.tableblock > table {
- border: 3px solid #527bbd;
-}
-thead, p.table.header {
- font-family: sans-serif;
- font-weight: bold;
-}
tfoot {
font-weight: bold;
}
td > div.verse {
white-space: pre;
}
-p.table {
- margin-top: 0;
-}
-/* Because the table frame attribute is overriden by CSS in most browsers. */
-div.tableblock > table[frame="void"] {
- border-style: none;
-}
-div.tableblock > table[frame="hsides"] {
- border-left-style: none;
- border-right-style: none;
-}
-div.tableblock > table[frame="vsides"] {
- border-top-style: none;
- border-bottom-style: none;
-}
-
div.hdlist {
margin-top: 0.8em;
@@ -339,25 +328,32 @@ span.footnote, span.footnoteref { min-width: 100px;
}
+div.colist td {
+ padding-right: 0.5em;
+ padding-bottom: 0.3em;
+ vertical-align: top;
+}
+div.colist td img {
+ margin-top: 0.3em;
+}
@media print {
- div#footer-badges { display: none; }
+ #footer-badges { display: none; }
}
-div#toc {
+#toc {
margin-bottom: 2.5em;
}
-div#toctitle {
+#toctitle {
color: #527bbd;
- font-family: sans-serif;
font-size: 1.1em;
font-weight: bold;
margin-top: 1.0em;
margin-bottom: 0.1em;
}
-div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
+div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
margin-top: 0;
margin-bottom: 0;
}
@@ -373,69 +369,173 @@ div.toclevel4 { margin-left: 6em;
font-size: 0.9em;
}
-/* Overrides for manpage documents */
-h1 {
- padding-top: 0.5em;
- padding-bottom: 0.5em;
- border-top: 2px solid silver;
- border-bottom: 2px solid silver;
+
+span.aqua { color: aqua; }
+span.black { color: black; }
+span.blue { color: blue; }
+span.fuchsia { color: fuchsia; }
+span.gray { color: gray; }
+span.green { color: green; }
+span.lime { color: lime; }
+span.maroon { color: maroon; }
+span.navy { color: navy; }
+span.olive { color: olive; }
+span.purple { color: purple; }
+span.red { color: red; }
+span.silver { color: silver; }
+span.teal { color: teal; }
+span.white { color: white; }
+span.yellow { color: yellow; }
+
+span.aqua-background { background: aqua; }
+span.black-background { background: black; }
+span.blue-background { background: blue; }
+span.fuchsia-background { background: fuchsia; }
+span.gray-background { background: gray; }
+span.green-background { background: green; }
+span.lime-background { background: lime; }
+span.maroon-background { background: maroon; }
+span.navy-background { background: navy; }
+span.olive-background { background: olive; }
+span.purple-background { background: purple; }
+span.red-background { background: red; }
+span.silver-background { background: silver; }
+span.teal-background { background: teal; }
+span.white-background { background: white; }
+span.yellow-background { background: yellow; }
+
+span.big { font-size: 2em; }
+span.small { font-size: 0.6em; }
+
+span.underline { text-decoration: underline; }
+span.overline { text-decoration: overline; }
+span.line-through { text-decoration: line-through; }
+
+div.unbreakable { page-break-inside: avoid; }
+
+
+/*
+ * xhtml11 specific
+ *
+ * */
+
+div.tableblock {
+ margin-top: 1.0em;
+ margin-bottom: 1.5em;
}
-h2 {
+div.tableblock > table {
+ border: 3px solid #527bbd;
+}
+thead, p.table.header {
+ font-weight: bold;
+ color: #527bbd;
+}
+p.table {
+ margin-top: 0;
+}
+/* Because the table frame attribute is overriden by CSS in most browsers. */
+div.tableblock > table[frame="void"] {
border-style: none;
}
-div.sectionbody {
- margin-left: 5%;
+div.tableblock > table[frame="hsides"] {
+ border-left-style: none;
+ border-right-style: none;
}
-
-@media print {
- div#toc { display: none; }
+div.tableblock > table[frame="vsides"] {
+ border-top-style: none;
+ border-bottom-style: none;
}
-/* Workarounds for IE6's broken and incomplete CSS2. */
-div.sidebar-content {
- background: #ffffee;
- border: 1px solid silver;
- padding: 0.5em;
+/*
+ * html5 specific
+ *
+ * */
+
+table.tableblock {
+ margin-top: 1.0em;
+ margin-bottom: 1.5em;
}
-div.sidebar-title, div.image-title {
- color: #527bbd;
- font-family: sans-serif;
+thead, p.tableblock.header {
font-weight: bold;
- margin-top: 0.0em;
- margin-bottom: 0.5em;
+ color: #527bbd;
+}
+p.tableblock {
+ margin-top: 0;
+}
+table.tableblock {
+ border-width: 3px;
+ border-spacing: 0px;
+ border-style: solid;
+ border-color: #527bbd;
+ border-collapse: collapse;
+}
+th.tableblock, td.tableblock {
+ border-width: 1px;
+ padding: 4px;
+ border-style: solid;
+ border-color: #527bbd;
}
-div.listingblock div.content {
- border: 1px solid silver;
- background: #f4f4f4;
- padding: 0.5em;
+table.tableblock.frame-topbot {
+ border-left-style: hidden;
+ border-right-style: hidden;
+}
+table.tableblock.frame-sides {
+ border-top-style: hidden;
+ border-bottom-style: hidden;
+}
+table.tableblock.frame-none {
+ border-style: hidden;
}
-div.quoteblock-attribution {
- padding-top: 0.5em;
+th.tableblock.halign-left, td.tableblock.halign-left {
+ text-align: left;
+}
+th.tableblock.halign-center, td.tableblock.halign-center {
+ text-align: center;
+}
+th.tableblock.halign-right, td.tableblock.halign-right {
text-align: right;
}
-div.verseblock-content {
- white-space: pre;
+th.tableblock.valign-top, td.tableblock.valign-top {
+ vertical-align: top;
}
-div.verseblock-attribution {
- padding-top: 0.75em;
- text-align: left;
+th.tableblock.valign-middle, td.tableblock.valign-middle {
+ vertical-align: middle;
+}
+th.tableblock.valign-bottom, td.tableblock.valign-bottom {
+ vertical-align: bottom;
}
-div.exampleblock-content {
- border-left: 3px solid #dddddd;
- padding-left: 0.5em;
+
+/*
+ * manpage specific
+ *
+ * */
+
+body.manpage h1 {
+ padding-top: 0.5em;
+ padding-bottom: 0.5em;
+ border-top: 2px solid silver;
+ border-bottom: 2px solid silver;
+}
+body.manpage h2 {
+ border-style: none;
+}
+body.manpage div.sectionbody {
+ margin-left: 3em;
}
-/* IE6 sets dynamically generated links as visited. */
-div#toc a:visited { color: blue; }
+@media print {
+ body.manpage div#toc { display: none; }
+}
+
+
</style>
<script type="text/javascript">
/*<+'])');
+ var re = new RegExp('[hH]([1-'+(toclevels+1)+'])');
// Function that scans the DOM tree for header elements (the DOM2
// nodeIterator API would be a better technique but not supported by all
// browsers).
@@ -497,6 +597,25 @@ toc: function (toclevels) { }
var toc = document.getElementById("toc");
+ if (!toc) {
+ return;
+ }
+
+ // Delete existing TOC entries in case we're reloading the TOC.
+ var tocEntriesToRemove = [];
+ var i;
+ for (i = 0; i < toc.childNodes.length; i++) {
+ var entry = toc.childNodes[i];
+ if (entry.nodeName.toLowerCase() == 'div'
+ && entry.getAttribute("class")
+ && entry.getAttribute("class").match(/^toclevel/))
+ tocEntriesToRemove.push(entry);
+ }
+ for (i = 0; i < tocEntriesToRemove.length; i++) {
+ toc.removeChild(tocEntriesToRemove[i]);
+ }
+
+ // Rebuild TOC entries.
var entries = tocEntries(document.getElementById("content"), toclevels);
for (var i = 0; i < entries.length; ++i) {
var entry = entries[i];
@@ -524,24 +643,44 @@ toc: function (toclevels) { */
footnotes: function () {
- var cont = document.getElementById("content");
+ // Delete existing footnote entries in case we're reloading the footnodes.
+ var i;
var noteholder = document.getElementById("footnotes");
+ if (!noteholder) {
+ return;
+ }
+ var entriesToRemove = [];
+ for (i = 0; i < noteholder.childNodes.length; i++) {
+ var entry = noteholder.childNodes[i];
+ if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
+ entriesToRemove.push(entry);
+ }
+ for (i = 0; i < entriesToRemove.length; i++) {
+ noteholder.removeChild(entriesToRemove[i]);
+ }
+
+ // Rebuild footnote entries.
+ var cont = document.getElementById("content");
var spans = cont.getElementsByTagName("span");
var refs = {};
var n = 0;
for (i=0; i<spans.length; i++) {
if (spans[i].className == "footnote") {
n++;
- // Use [\s\S] in place of . so multi-line matches work.
- // Because JavaScript has no s (dotall) regex flag.
- note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
+ var note = spans[i].getAttribute("data-note");
+ if (!note) {
+ // Use [\s\S] in place of . so multi-line matches work.
+ // Because JavaScript has no s (dotall) regex flag.
+ note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
+ spans[i].innerHTML =
+ "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
+ "' title='View footnote' class='footnote'>" + n + "</a>]";
+ spans[i].setAttribute("data-note", note);
+ }
noteholder.innerHTML +=
"<div class='footnote' id='_footnote_" + n + "'>" +
"<a href='#_footnoteref_" + n + "' title='Return to text'>" +
n + "</a>. " + note + "</div>";
- spans[i].innerHTML =
- "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
- "' title='View footnote' class='footnote'>" + n + "</a>]";
var id =spans[i].getAttribute("id");
if (id != null) refs["#"+id] = n;
}
@@ -561,13 +700,36 @@ footnotes: function () { }
}
}
+},
+
+install: function(toclevels) {
+ var timerId;
+
+ function reinstall() {
+ asciidoc.footnotes();
+ if (toclevels) {
+ asciidoc.toc(toclevels);
+ }
+ }
+
+ function reinstallAndRemoveTimer() {
+ clearInterval(timerId);
+ reinstall();
+ }
+
+ timerId = setInterval(reinstall, 500);
+ if (document.addEventListener)
+ document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);
+ else
+ window.onload = reinstallAndRemoveTimer;
}
}
+asciidoc.install();
/*]]>*/
</script>
</head>
-<body>
+<body class="manpage">
<div id="header">
<h1>
gittutorial(7) Manual Page
@@ -580,13 +742,16 @@ gittutorial(7) Manual Page </div>
</div>
<div id="content">
+<div class="sect1">
<h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<div class="verseblock-content">git *</div>
-<div class="verseblock-attribution">
+<pre class="content">git *</pre>
+<div class="attribution">
</div></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
<div class="paragraph"><p>This tutorial explains how to import a new project into git, make
@@ -595,15 +760,15 @@ changes to it, and share changes with other developers.</p></div> for example, to test the latest version, you may prefer to start with
the first two chapters of <a href="user-manual.html">The Git User’s Manual</a>.</p></div>
<div class="paragraph"><p>First, note that you can get documentation for a command such as
-<tt>git log --graph</tt> with:</p></div>
+<code>git log --graph</code> with:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ man git-log</tt></pre>
+<pre><code>$ man git-log</code></pre>
</div></div>
<div class="paragraph"><p>or:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git help log</tt></pre>
+<pre><code>$ git help log</code></pre>
</div></div>
<div class="paragraph"><p>With the latter, you can use the manual viewer of your choice; see
<a href="git-help.html">git-help(1)</a> for more information.</p></div>
@@ -612,24 +777,26 @@ public email address before doing any operation. The easiest way to do so is:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git config --global user.name "Your Name Comes Here"
-$ git config --global user.email you@yourdomain.example.com</tt></pre>
+<pre><code>$ git config --global user.name "Your Name Comes Here"
+$ git config --global user.email you@yourdomain.example.com</code></pre>
</div></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_importing_a_new_project">Importing a new project</h2>
<div class="sectionbody">
<div class="paragraph"><p>Assume you have a tarball project.tar.gz with your initial work. You
can place it under git revision control as follows.</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ tar xzf project.tar.gz
+<pre><code>$ tar xzf project.tar.gz
$ cd project
-$ git init</tt></pre>
+$ git init</code></pre>
</div></div>
<div class="paragraph"><p>Git will reply</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>Initialized empty Git repository in .git/</tt></pre>
+<pre><code>Initialized empty Git repository in .git/</code></pre>
</div></div>
<div class="paragraph"><p>You’ve now initialized the working directory—you may notice a new
directory created, named ".git".</p></div>
@@ -637,37 +804,39 @@ directory created, named ".git".</p></div> current directory (note the <em>.</em>), with <em>git add</em>:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git add .</tt></pre>
+<pre><code>$ git add .</code></pre>
</div></div>
<div class="paragraph"><p>This snapshot is now stored in a temporary staging area which git calls
the "index". You can permanently store the contents of the index in the
repository with <em>git commit</em>:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git commit</tt></pre>
+<pre><code>$ git commit</code></pre>
</div></div>
<div class="paragraph"><p>This will prompt you for a commit message. You’ve now stored the first
version of your project in git.</p></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_making_changes">Making changes</h2>
<div class="sectionbody">
<div class="paragraph"><p>Modify some files, then add their updated contents to the index:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git add file1 file2 file3</tt></pre>
+<pre><code>$ git add file1 file2 file3</code></pre>
</div></div>
<div class="paragraph"><p>You are now ready to commit. You can see what is about to be committed
using <em>git diff</em> with the --cached option:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git diff --cached</tt></pre>
+<pre><code>$ git diff --cached</code></pre>
</div></div>
<div class="paragraph"><p>(Without --cached, <em>git diff</em> will show you any changes that
you’ve made but not yet added to the index.) You can also get a brief
summary of the situation with <em>git status</em>:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git status
+<pre><code>$ git status
# On branch master
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
@@ -675,20 +844,20 @@ summary of the situation with <em>git status</em>:</p></div> # modified: file1
# modified: file2
# modified: file3
-#</tt></pre>
+#</code></pre>
</div></div>
<div class="paragraph"><p>If you need to make any further adjustments, do so now, and then add any
newly modified content to the index. Finally, commit your changes with:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git commit</tt></pre>
+<pre><code>$ git commit</code></pre>
</div></div>
<div class="paragraph"><p>This will again prompt you for a message describing the change, and then
record a new version of the project.</p></div>
<div class="paragraph"><p>Alternatively, instead of running <em>git add</em> beforehand, you can use</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git commit -a</tt></pre>
+<pre><code>$ git commit -a</code></pre>
</div></div>
<div class="paragraph"><p>which will automatically notice any modified (but not new) files, add
them to the index, and commit, all in one step.</p></div>
@@ -701,52 +870,58 @@ throughout git. For example, <a href="git-format-patch.html">git-format-patch(1 commit into email, and it uses the title on the Subject line and the
rest of the commit in the body.</p></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_git_tracks_content_not_files">Git tracks content not files</h2>
<div class="sectionbody">
-<div class="paragraph"><p>Many revision control systems provide an <tt>add</tt> command that tells the
-system to start tracking changes to a new file. Git’s <tt>add</tt> command
+<div class="paragraph"><p>Many revision control systems provide an <code>add</code> command that tells the
+system to start tracking changes to a new file. Git’s <code>add</code> command
does something simpler and more powerful: <em>git add</em> is used both for new
and newly modified files, and in both cases it takes a snapshot of the
given files and stages that content in the index, ready for inclusion in
the next commit.</p></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_viewing_project_history">Viewing project history</h2>
<div class="sectionbody">
<div class="paragraph"><p>At any point you can view the history of your changes using</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git log</tt></pre>
+<pre><code>$ git log</code></pre>
</div></div>
<div class="paragraph"><p>If you also want to see complete diffs at each step, use</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git log -p</tt></pre>
+<pre><code>$ git log -p</code></pre>
</div></div>
<div class="paragraph"><p>Often the overview of the change is useful to get a feel of
each step</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git log --stat --summary</tt></pre>
+<pre><code>$ git log --stat --summary</code></pre>
</div></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_managing_branches">Managing branches</h2>
<div class="sectionbody">
<div class="paragraph"><p>A single git repository can maintain multiple branches of
development. To create a new branch named "experimental", use</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git branch experimental</tt></pre>
+<pre><code>$ git branch experimental</code></pre>
</div></div>
<div class="paragraph"><p>If you now run</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git branch</tt></pre>
+<pre><code>$ git branch</code></pre>
</div></div>
<div class="paragraph"><p>you’ll get a list of all existing branches:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt> experimental
-* master</tt></pre>
+<pre><code> experimental
+* master</code></pre>
</div></div>
<div class="paragraph"><p>The "experimental" branch is the one you just created, and the
"master" branch is a default branch that was created for you
@@ -754,52 +929,52 @@ automatically. The asterisk marks the branch you are currently on; type</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git checkout experimental</tt></pre>
+<pre><code>$ git checkout experimental</code></pre>
</div></div>
<div class="paragraph"><p>to switch to the experimental branch. Now edit a file, commit the
change, and switch back to the master branch:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>(edit file)
+<pre><code>(edit file)
$ git commit -a
-$ git checkout master</tt></pre>
+$ git checkout master</code></pre>
</div></div>
<div class="paragraph"><p>Check that the change you made is no longer visible, since it was
made on the experimental branch and you’re back on the master branch.</p></div>
<div class="paragraph"><p>You can make a different change on the master branch:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>(edit file)
-$ git commit -a</tt></pre>
+<pre><code>(edit file)
+$ git commit -a</code></pre>
</div></div>
<div class="paragraph"><p>at this point the two branches have diverged, with different changes
made in each. To merge the changes made in experimental into master, run</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git merge experimental</tt></pre>
+<pre><code>$ git merge experimental</code></pre>
</div></div>
<div class="paragraph"><p>If the changes don’t conflict, you’re done. If there are conflicts,
markers will be left in the problematic files showing the conflict;</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git diff</tt></pre>
+<pre><code>$ git diff</code></pre>
</div></div>
<div class="paragraph"><p>will show this. Once you’ve edited the files to resolve the
conflicts,</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git commit -a</tt></pre>
+<pre><code>$ git commit -a</code></pre>
</div></div>
<div class="paragraph"><p>will commit the result of the merge. Finally,</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ gitk</tt></pre>
+<pre><code>$ gitk</code></pre>
</div></div>
<div class="paragraph"><p>will show a nice graphical representation of the resulting history.</p></div>
<div class="paragraph"><p>At this point you could delete the experimental branch with</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git branch -d experimental</tt></pre>
+<pre><code>$ git branch -d experimental</code></pre>
</div></div>
<div class="paragraph"><p>This command ensures that the changes in the experimental branch are
already in the current branch.</p></div>
@@ -807,11 +982,13 @@ already in the current branch.</p></div> delete the branch with</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git branch -D crazy-idea</tt></pre>
+<pre><code>$ git branch -D crazy-idea</code></pre>
</div></div>
<div class="paragraph"><p>Branches are cheap and easy, so this is a good way to try something
out.</p></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_using_git_for_collaboration">Using git for collaboration</h2>
<div class="sectionbody">
<div class="paragraph"><p>Suppose that Alice has started a new project with a git repository in
@@ -820,7 +997,7 @@ same machine, wants to contribute.</p></div> <div class="paragraph"><p>Bob begins with:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>bob$ git clone /home/alice/project myrepo</tt></pre>
+<pre><code>bob$ git clone /home/alice/project myrepo</code></pre>
</div></div>
<div class="paragraph"><p>This creates a new directory "myrepo" containing a clone of Alice’s
repository. The clone is on an equal footing with the original
@@ -828,16 +1005,16 @@ project, possessing its own copy of the original project’s history.</p></d <div class="paragraph"><p>Bob then makes some changes and commits them:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>(edit files)
+<pre><code>(edit files)
bob$ git commit -a
-(repeat as necessary)</tt></pre>
+(repeat as necessary)</code></pre>
</div></div>
<div class="paragraph"><p>When he’s ready, he tells Alice to pull changes from the repository
at /home/bob/myrepo. She does this with:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>alice$ cd /home/alice/project
-alice$ git pull /home/bob/myrepo master</tt></pre>
+<pre><code>alice$ cd /home/alice/project
+alice$ git pull /home/bob/myrepo master</code></pre>
</div></div>
<div class="paragraph"><p>This merges the changes from Bob’s "master" branch into Alice’s
current branch. If Alice has made her own changes in the meantime,
@@ -857,8 +1034,8 @@ symbol "FETCH_HEAD", in order to determine if he has anything worth pulling, like this:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>alice$ git fetch /home/bob/myrepo master
-alice$ git log -p HEAD..FETCH_HEAD</tt></pre>
+<pre><code>alice$ git fetch /home/bob/myrepo master
+alice$ git log -p HEAD..FETCH_HEAD</code></pre>
</div></div>
<div class="paragraph"><p>This operation is safe even if Alice has uncommitted local changes.
The range notation "HEAD..FETCH_HEAD" means "show everything that is reachable
@@ -870,14 +1047,14 @@ seen with this command.</p></div> she can issue the following command:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ gitk HEAD..FETCH_HEAD</tt></pre>
+<pre><code>$ gitk HEAD..FETCH_HEAD</code></pre>
</div></div>
<div class="paragraph"><p>This uses the same two-dot range notation we saw earlier with <em>git log</em>.</p></div>
<div class="paragraph"><p>Alice may want to view what both of them did since they forked.
She can use three-dot form instead of the two-dot form:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ gitk HEAD...FETCH_HEAD</tt></pre>
+<pre><code>$ gitk HEAD...FETCH_HEAD</code></pre>
</div></div>
<div class="paragraph"><p>This means "show everything that is reachable from either one, but
exclude anything that is reachable from both of them".</p></div>
@@ -894,22 +1071,22 @@ again. By defining <em>remote</em> repository shorthand, you can make it easier:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>alice$ git remote add bob /home/bob/myrepo</tt></pre>
+<pre><code>alice$ git remote add bob /home/bob/myrepo</code></pre>
</div></div>
<div class="paragraph"><p>With this, Alice can perform the first part of the "pull" operation
alone using the <em>git fetch</em> command without merging them with her own
branch, using:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>alice$ git fetch bob</tt></pre>
+<pre><code>alice$ git fetch bob</code></pre>
</div></div>
<div class="paragraph"><p>Unlike the longhand form, when Alice fetches from Bob using a
remote repository shorthand set up with <em>git remote</em>, what was
fetched is stored in a remote-tracking branch, in this case
-<tt>bob/master</tt>. So after this:</p></div>
+<code>bob/master</code>. So after this:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>alice$ git log -p master..bob/master</tt></pre>
+<pre><code>alice$ git log -p master..bob/master</code></pre>
</div></div>
<div class="paragraph"><p>shows a list of all the changes that Bob made since he branched from
Alice’s master branch.</p></div>
@@ -917,20 +1094,20 @@ Alice’s master branch.</p></div> could merge the changes into her master branch:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>alice$ git merge bob/master</tt></pre>
+<pre><code>alice$ git merge bob/master</code></pre>
</div></div>
-<div class="paragraph"><p>This <tt>merge</tt> can also be done by <em>pulling from her own remote-tracking
+<div class="paragraph"><p>This <code>merge</code> can also be done by <em>pulling from her own remote-tracking
branch</em>, like this:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>alice$ git pull . remotes/bob/master</tt></pre>
+<pre><code>alice$ git pull . remotes/bob/master</code></pre>
</div></div>
<div class="paragraph"><p>Note that git pull always merges into the current branch,
regardless of what else is given on the command line.</p></div>
<div class="paragraph"><p>Later, Bob can update his repo with Alice’s latest changes using</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>bob$ git pull</tt></pre>
+<pre><code>bob$ git pull</code></pre>
</div></div>
<div class="paragraph"><p>Note that he doesn’t need to give the path to Alice’s repository;
when Bob cloned Alice’s repository, git stored the location of her
@@ -938,24 +1115,24 @@ repository in the repository configuration, and that location is used for pulls:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>bob$ git config --get remote.origin.url
-/home/alice/project</tt></pre>
+<pre><code>bob$ git config --get remote.origin.url
+/home/alice/project</code></pre>
</div></div>
<div class="paragraph"><p>(The complete configuration created by <em>git clone</em> is visible using
-<tt>git config -l</tt>, and the <a href="git-config.html">git-config(1)</a> man page
+<code>git config -l</code>, and the <a href="git-config.html">git-config(1)</a> man page
explains the meaning of each option.)</p></div>
<div class="paragraph"><p>Git also keeps a pristine copy of Alice’s master branch under the
name "origin/master":</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>bob$ git branch -r
- origin/master</tt></pre>
+<pre><code>bob$ git branch -r
+ origin/master</code></pre>
</div></div>
<div class="paragraph"><p>If Bob later decides to work from a different host, he can still
perform clones and pulls using the ssh protocol:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>bob$ git clone alice.org:/home/alice/project myrepo</tt></pre>
+<pre><code>bob$ git clone alice.org:/home/alice/project myrepo</code></pre>
</div></div>
<div class="paragraph"><p>Alternatively, git has a native protocol, or can use rsync or http;
see <a href="git-pull.html">git-pull(1)</a> for details.</p></div>
@@ -963,6 +1140,8 @@ see <a href="git-pull.html">git-pull(1)</a> for details.</p></div> that various users push changes to; see <a href="git-push.html">git-push(1)</a> and
<a href="gitcvs-migration.html">gitcvs-migration(7)</a>.</p></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_exploring_history">Exploring history</h2>
<div class="sectionbody">
<div class="paragraph"><p>Git history is represented as a series of interrelated commits. We
@@ -971,46 +1150,46 @@ Note that first line of each git log entry also gives a name for the commit:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git log
+<pre><code>$ git log
commit c82a22c39cbc32576f64f5c6b3f24b99ea8149c7
Author: Junio C Hamano <junkio@cox.net>
Date: Tue May 16 17:18:22 2006 -0700
- merge-base: Clarify the comments on post processing.</tt></pre>
+ merge-base: Clarify the comments on post processing.</code></pre>
</div></div>
<div class="paragraph"><p>We can give this name to <em>git show</em> to see the details about this
commit.</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git show c82a22c39cbc32576f64f5c6b3f24b99ea8149c7</tt></pre>
+<pre><code>$ git show c82a22c39cbc32576f64f5c6b3f24b99ea8149c7</code></pre>
</div></div>
<div class="paragraph"><p>But there are other ways to refer to commits. You can use any initial
part of the name that is long enough to uniquely identify the commit:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git show c82a22c39c # the first few characters of the name are
+<pre><code>$ git show c82a22c39c # the first few characters of the name are
# usually enough
$ git show HEAD # the tip of the current branch
-$ git show experimental # the tip of the "experimental" branch</tt></pre>
+$ git show experimental # the tip of the "experimental" branch</code></pre>
</div></div>
<div class="paragraph"><p>Every commit usually has one "parent" commit
which points to the previous state of the project:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git show HEAD^ # to see the parent of HEAD
+<pre><code>$ git show HEAD^ # to see the parent of HEAD
$ git show HEAD^^ # to see the grandparent of HEAD
-$ git show HEAD~4 # to see the great-great grandparent of HEAD</tt></pre>
+$ git show HEAD~4 # to see the great-great grandparent of HEAD</code></pre>
</div></div>
<div class="paragraph"><p>Note that merge commits may have more than one parent:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git show HEAD^1 # show the first parent of HEAD (same as HEAD^)
-$ git show HEAD^2 # show the second parent of HEAD</tt></pre>
+<pre><code>$ git show HEAD^1 # show the first parent of HEAD (same as HEAD^)
+$ git show HEAD^2 # show the second parent of HEAD</code></pre>
</div></div>
<div class="paragraph"><p>You can also give commits names of your own; after running</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git tag v2.5 1b2e1d63ff</tt></pre>
+<pre><code>$ git tag v2.5 1b2e1d63ff</code></pre>
</div></div>
<div class="paragraph"><p>you can refer to 1b2e1d63ff by the name "v2.5". If you intend to
share this name with other people (for example, to identify a release
@@ -1020,11 +1199,11 @@ version), you should create a "tag" object, and perhaps sign it; see names. For example:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git diff v2.5 HEAD # compare the current HEAD to v2.5
+<pre><code>$ git diff v2.5 HEAD # compare the current HEAD to v2.5
$ git branch stable v2.5 # start a new branch named "stable" based
# at v2.5
$ git reset --hard HEAD^ # reset your current branch and working
- # directory to its state at HEAD^</tt></pre>
+ # directory to its state at HEAD^</code></pre>
</div></div>
<div class="paragraph"><p>Be careful with that last command: in addition to losing any changes
in the working directory, it will also remove all later commits from
@@ -1038,25 +1217,25 @@ instead.</p></div> project, so</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git grep "hello" v2.5</tt></pre>
+<pre><code>$ git grep "hello" v2.5</code></pre>
</div></div>
<div class="paragraph"><p>searches for all occurrences of "hello" in v2.5.</p></div>
<div class="paragraph"><p>If you leave out the commit name, <em>git grep</em> will search any of the
files it manages in your current directory. So</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git grep "hello"</tt></pre>
+<pre><code>$ git grep "hello"</code></pre>
</div></div>
<div class="paragraph"><p>is a quick way to search just the files that are tracked by git.</p></div>
<div class="paragraph"><p>Many git commands also take sets of commits, which can be specified
in a number of ways. Here are some examples with <em>git log</em>:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git log v2.5..v2.6 # commits between v2.5 and v2.6
+<pre><code>$ git log v2.5..v2.6 # commits between v2.5 and v2.6
$ git log v2.5.. # commits since v2.5
$ git log --since="2 weeks ago" # commits from the last 2 weeks
$ git log v2.5.. Makefile # commits since v2.5 which modify
- # Makefile</tt></pre>
+ # Makefile</code></pre>
</div></div>
<div class="paragraph"><p>You can also give <em>git log</em> a "range" of commits where the first is not
necessarily an ancestor of the second; for example, if the tips of
@@ -1064,13 +1243,13 @@ the branches "stable" and "master" diverged from a common commit some time ago, then</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git log stable..master</tt></pre>
+<pre><code>$ git log stable..master</code></pre>
</div></div>
<div class="paragraph"><p>will list commits made in the master branch but not in the
stable branch, while</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git log master..stable</tt></pre>
+<pre><code>$ git log master..stable</code></pre>
</div></div>
<div class="paragraph"><p>will show the list of commits made on the stable branch but not
the master branch.</p></div>
@@ -1083,7 +1262,7 @@ or git itself) have frequent merges, and <em>gitk</em> does a better job of visualizing their history. For example,</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ gitk --since="2 weeks ago" drivers/</tt></pre>
+<pre><code>$ gitk --since="2 weeks ago" drivers/</code></pre>
</div></div>
<div class="paragraph"><p>allows you to browse any commits from the last 2 weeks of commits
that modified files under the "drivers" directory. (Note: you can
@@ -1094,14 +1273,16 @@ to precede any filename by a commit, to specify a particular version of the file:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git diff v2.5:Makefile HEAD:Makefile.in</tt></pre>
+<pre><code>$ git diff v2.5:Makefile HEAD:Makefile.in</code></pre>
</div></div>
<div class="paragraph"><p>You can also use <em>git show</em> to see any such file:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git show v2.5:Makefile</tt></pre>
+<pre><code>$ git show v2.5:Makefile</code></pre>
</div></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_next_steps">Next Steps</h2>
<div class="sectionbody">
<div class="paragraph"><p>This tutorial should be enough to perform basic distributed revision
@@ -1166,6 +1347,8 @@ digressions that may be interesting at this point are:</p></div> </li>
</ul></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_see_also">SEE ALSO</h2>
<div class="sectionbody">
<div class="paragraph"><p><a href="gittutorial-2.html">gittutorial-2(7)</a>,
@@ -1177,11 +1360,14 @@ digressions that may be interesting at this point are:</p></div> <a href="everyday.html">Everyday git</a>,
<a href="user-manual.html">The Git User’s Manual</a></p></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_git">GIT</h2>
<div class="sectionbody">
<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite.</p></div>
</div>
</div>
+</div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
|