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 /git-branch.html | |
| parent | 9629d4f49e5ffcff5c5beb5c40bedcffcabcd905 (diff) | |
| download | git-htmldocs-9d9711544dc3090db6e5c52f9ce9c300bf4f5c14.tar.gz | |
Autogenerated HTML docs for v1.8.1-rc2-5-g252f9
Diffstat (limited to 'git-branch.html')
| -rw-r--r-- | git-branch.html | 482 |
1 files changed, 329 insertions, 153 deletions
diff --git a/git-branch.html b/git-branch.html index 7d62cf91a..fe4da266e 100644 --- a/git-branch.html +++ b/git-branch.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>git-branch(1)</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;
+}
+
+@media print {
+ body.manpage div#toc { display: none; }
}
-/* IE6 sets dynamically generated links as visited. */
-div#toc a:visited { color: blue; }
+
</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>
git-branch(1) Manual Page
@@ -580,10 +742,11 @@ git-branch(1) 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"><em>git branch</em> [--color[=<when>] | --no-color] [-r | -a]
+<pre class="content"><em>git branch</em> [--color[=<when>] | --no-color] [-r | -a]
[--list] [-v [--abbrev=<length> | --no-abbrev]]
[--column[=<options>] | --no-column]
[(--merged | --no-merged | --contains) [<commit>]] [<pattern>…]
@@ -592,24 +755,26 @@ git-branch(1) Manual Page <em>git branch</em> --unset-upstream [<branchname>]
<em>git branch</em> (-m | -M) [<oldbranch>] <newbranch>
<em>git branch</em> (-d | -D) [-r] <branchname>…
-<em>git branch</em> --edit-description [<branchname>]</div>
-<div class="verseblock-attribution">
+<em>git branch</em> --edit-description [<branchname>]</pre>
+<div class="attribution">
</div></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
<div class="paragraph"><p>With no arguments, existing branches are listed and the current branch will
-be highlighted with an asterisk. Option <tt>-r</tt> causes the remote-tracking
-branches to be listed, and option <tt>-a</tt> shows both. This list mode is also
-activated by the <tt>--list</tt> option (see below).
+be highlighted with an asterisk. Option <code>-r</code> causes the remote-tracking
+branches to be listed, and option <code>-a</code> shows both. This list mode is also
+activated by the <code>--list</code> option (see below).
<pattern> restricts the output to matching branches, the pattern is a shell
wildcard (i.e., matched using fnmatch(3)).
Multiple patterns may be given; if any of them matches, the branch is shown.</p></div>
-<div class="paragraph"><p>With <tt>--contains</tt>, shows only the branches that contain the named commit
+<div class="paragraph"><p>With <code>--contains</code>, shows only the branches that contain the named commit
(in other words, the branches whose tip commits are descendants of the
-named commit). With <tt>--merged</tt>, only branches merged into the named
+named commit). With <code>--merged</code>, only branches merged into the named
commit (i.e. the branches whose tip commits are reachable from the named
-commit) will be listed. With <tt>--no-merged</tt> only branches not merged into
+commit) will be listed. With <code>--no-merged</code> only branches not merged into
the named commit will be listed. If the <commit> argument is missing it
defaults to <em>HEAD</em> (i.e. the tip of the current branch).</p></div>
<div class="paragraph"><p>The command’s second form creates a new branch head named <branchname>
@@ -620,23 +785,25 @@ new branch.</p></div> <div class="paragraph"><p>When a local branch is started off a remote-tracking branch, git sets up the
branch so that <em>git pull</em> will appropriately merge from
the remote-tracking branch. This behavior may be changed via the global
-<tt>branch.autosetupmerge</tt> configuration flag. That setting can be
-overridden by using the <tt>--track</tt> and <tt>--no-track</tt> options, and
-changed later using <tt>git branch --set-upstream-to</tt>.</p></div>
-<div class="paragraph"><p>With a <tt>-m</tt> or <tt>-M</tt> option, <oldbranch> will be renamed to <newbranch>.
+<code>branch.autosetupmerge</code> configuration flag. That setting can be
+overridden by using the <code>--track</code> and <code>--no-track</code> options, and
+changed later using <code>git branch --set-upstream-to</code>.</p></div>
+<div class="paragraph"><p>With a <code>-m</code> or <code>-M</code> option, <oldbranch> will be renamed to <newbranch>.
If <oldbranch> had a corresponding reflog, it is renamed to match
<newbranch>, and a reflog entry is created to remember the branch
renaming. If <newbranch> exists, -M must be used to force the rename
to happen.</p></div>
-<div class="paragraph"><p>With a <tt>-d</tt> or <tt>-D</tt> option, <tt><branchname></tt> will be deleted. You may
+<div class="paragraph"><p>With a <code>-d</code> or <code>-D</code> option, <code><branchname></code> will be deleted. You may
specify more than one branch for deletion. If the branch currently
has a reflog then the reflog will also be deleted.</p></div>
-<div class="paragraph"><p>Use <tt>-r</tt> together with <tt>-d</tt> to delete remote-tracking branches. Note, that it
+<div class="paragraph"><p>Use <code>-r</code> together with <code>-d</code> to delete remote-tracking branches. Note, that it
only makes sense to delete remote-tracking branches if they no longer exist
in the remote repository or if <em>git fetch</em> was configured not to fetch
them again. See also the <em>prune</em> subcommand of <a href="git-remote.html">git-remote(1)</a> for a
way to clean up all obsolete remote-tracking branches.</p></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_options">OPTIONS</h2>
<div class="sectionbody">
<div class="dlist"><dl>
@@ -649,8 +816,8 @@ way to clean up all obsolete remote-tracking branches.</p></div> <dd>
<p>
Delete a branch. The branch must be fully merged in its
- upstream branch, or in <tt>HEAD</tt> if no upstream was set with
- <tt>--track</tt> or <tt>--set-upstream</tt>.
+ upstream branch, or in <code>HEAD</code> if no upstream was set with
+ <code>--track</code> or <code>--set-upstream</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -673,7 +840,7 @@ way to clean up all obsolete remote-tracking branches.</p></div> all changes made to the branch ref, enabling use of date
based sha1 expressions such as "<branchname>@{yesterday}".
Note that in non-bare repositories, reflogs are usually
- enabled by default by the <tt>core.logallrefupdates</tt> config option.
+ enabled by default by the <code>core.logallrefupdates</code> config option.
</p>
</dd>
<dt class="hdlist1">
@@ -685,7 +852,7 @@ way to clean up all obsolete remote-tracking branches.</p></div> <dd>
<p>
Reset <branchname> to <startpoint> if <branchname> exists
- already. Without <tt>-f</tt> <em>git branch</em> refuses to change an existing branch.
+ already. Without <code>-f</code> <em>git branch</em> refuses to change an existing branch.
</p>
</dd>
<dt class="hdlist1">
@@ -724,7 +891,7 @@ way to clean up all obsolete remote-tracking branches.</p></div> <p>
Turn off branch colors, even when the configuration file gives the
default to color output.
- Same as <tt>--color=never</tt>.
+ Same as <code>--color=never</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -736,7 +903,7 @@ way to clean up all obsolete remote-tracking branches.</p></div> <dd>
<p>
Display branch listing in columns. See configuration variable
- column.branch for option syntax.<tt>--column</tt> and <tt>--no-column</tt>
+ column.branch for option syntax.<code>--column</code> and <code>--no-column</code>
without options are equivalent to <em>always</em> and <em>never</em> respectively.
</p>
<div class="paragraph"><p>This option is only applicable in non-verbose mode.</p></div>
@@ -768,8 +935,8 @@ way to clean up all obsolete remote-tracking branches.</p></div> </dt>
<dd>
<p>
- Activate the list mode. <tt>git branch <pattern></tt> would try to create a branch,
- use <tt>git branch --list <pattern></tt> to list matching branches.
+ Activate the list mode. <code>git branch <pattern></code> would try to create a branch,
+ use <code>git branch --list <pattern></code> to list matching branches.
</p>
</dd>
<dt class="hdlist1">
@@ -786,8 +953,8 @@ way to clean up all obsolete remote-tracking branches.</p></div> When in list mode,
show sha1 and commit subject line for each head, along with
relationship to upstream branch (if any). If given twice, print
- the name of the upstream branch, as well (see also <tt>git remote
- show <remote></tt>).
+ the name of the upstream branch, as well (see also <code>git remote
+ show <remote></code>).
</p>
</dd>
<dt class="hdlist1">
@@ -808,7 +975,7 @@ way to clean up all obsolete remote-tracking branches.</p></div> <dd>
<p>
Alter the sha1’s minimum display length in the output listing.
- The default value is 7 and can be overridden by the <tt>core.abbrev</tt>
+ The default value is 7 and can be overridden by the <code>core.abbrev</code>
config option.
</p>
</dd>
@@ -831,14 +998,14 @@ way to clean up all obsolete remote-tracking branches.</p></div> When creating a new branch, set up configuration to mark the
start-point branch as "upstream" from the new branch. This
configuration will tell git to show the relationship between the
- two branches in <tt>git status</tt> and <tt>git branch -v</tt>. Furthermore,
- it directs <tt>git pull</tt> without arguments to pull from the
+ two branches in <code>git status</code> and <code>git branch -v</code>. Furthermore,
+ it directs <code>git pull</code> without arguments to pull from the
upstream when the new branch is checked out.
</p>
<div class="paragraph"><p>This behavior is the default when the start point is a remote-tracking branch.
-Set the branch.autosetupmerge configuration variable to <tt>false</tt> if you
-want <tt>git checkout</tt> and <tt>git branch</tt> to always behave as if <em>--no-track</em>
-were given. Set it to <tt>always</tt> if you want this behavior when the
+Set the branch.autosetupmerge configuration variable to <code>false</code> if you
+want <code>git checkout</code> and <code>git branch</code> to always behave as if <em>--no-track</em>
+were given. Set it to <code>always</code> if you want this behavior when the
start-point is either a local or remote-tracking branch.</p></div>
</dd>
<dt class="hdlist1">
@@ -855,9 +1022,9 @@ start-point is either a local or remote-tracking branch.</p></div> </dt>
<dd>
<p>
- If specified branch does not exist yet or if <tt>--force</tt> has been
- given, acts exactly like <tt>--track</tt>. Otherwise sets up configuration
- like <tt>--track</tt> would when creating the branch, except that where
+ If specified branch does not exist yet or if <code>--force</code> has been
+ given, acts exactly like <code>--track</code>. Otherwise sets up configuration
+ like <code>--track</code> would when creating the branch, except that where
branch points to is not changed.
</p>
</dd>
@@ -889,7 +1056,7 @@ start-point is either a local or remote-tracking branch.</p></div> <dd>
<p>
Open an editor and edit the text to explain what the branch is
- for, to be used by various other commands (e.g. <tt>request-pull</tt>).
+ for, to be used by various other commands (e.g. <code>request-pull</code>).
</p>
</dd>
<dt class="hdlist1">
@@ -959,6 +1126,8 @@ start-point is either a local or remote-tracking branch.</p></div> </dd>
</dl></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_examples">Examples</h2>
<div class="sectionbody">
<div class="dlist"><dl>
@@ -968,10 +1137,10 @@ Start development from a known tag <dd>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6
+<pre><code>$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6
$ cd my2.6
$ git branch my2.6.14 v2.6.14 <b><1></b>
-$ git checkout my2.6.14</tt></pre>
+$ git checkout my2.6.14</code></pre>
</div></div>
<div class="colist arabic"><ol>
<li>
@@ -988,10 +1157,10 @@ Delete an unneeded branch <dd>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git clone git://git.kernel.org/.../git.git my.git
+<pre><code>$ git clone git://git.kernel.org/.../git.git my.git
$ cd my.git
$ git branch -d -r origin/todo origin/html origin/man <b><1></b>
-$ git branch -D test <b><2></b></tt></pre>
+$ git branch -D test <b><2></b></code></pre>
</div></div>
<div class="colist arabic"><ol>
<li>
@@ -1011,35 +1180,39 @@ is currently checked out) does not have all commits from the test branch. </dd>
</dl></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_notes">Notes</h2>
<div class="sectionbody">
<div class="paragraph"><p>If you are creating a branch that you want to checkout immediately, it is
-easier to use the git checkout command with its <tt>-b</tt> option to create
+easier to use the git checkout command with its <code>-b</code> option to create
a branch and check it out with a single command.</p></div>
-<div class="paragraph"><p>The options <tt>--contains</tt>, <tt>--merged</tt> and <tt>--no-merged</tt> serve three related
+<div class="paragraph"><p>The options <code>--contains</code>, <code>--merged</code> and <code>--no-merged</code> serve three related
but different purposes:</p></div>
<div class="ulist"><ul>
<li>
<p>
-<tt>--contains <commit></tt> is used to find all branches which will need
+<code>--contains <commit></code> is used to find all branches which will need
special attention if <commit> were to be rebased or amended, since those
branches contain the specified <commit>.
</p>
</li>
<li>
<p>
-<tt>--merged</tt> is used to find all branches which can be safely deleted,
+<code>--merged</code> is used to find all branches which can be safely deleted,
since those branches are fully contained by HEAD.
</p>
</li>
<li>
<p>
-<tt>--no-merged</tt> is used to find branches which are candidates for merging
+<code>--no-merged</code> is used to find branches which are candidates for merging
into HEAD, since those branches are not fully contained by HEAD.
</p>
</li>
</ul></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_see_also">SEE ALSO</h2>
<div class="sectionbody">
<div class="paragraph"><p><a href="git-check-ref-format.html">git-check-ref-format(1)</a>,
@@ -1048,11 +1221,14 @@ but different purposes:</p></div> <a href="user-manual.html#what-is-a-branch">“Understanding history: What is
a branch?”</a> in the Git User’s Manual.</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">
|