diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-12-10 14:53:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-12-10 14:53:38 -0800 |
| commit | 59a32b07d3e226cad19135aee37bf81c8849efc8 (patch) | |
| tree | 36b60b52ab5a116eed5ea4723dfa5559da7981a2 /git-checkout.html | |
| parent | f24d6b5b23d901f1da0026ce4b3f9c1e1b5e09f6 (diff) | |
| download | git-htmldocs-59a32b07d3e226cad19135aee37bf81c8849efc8.tar.gz | |
Autogenerated HTML docs for v2.34.1-182-ge7735
Diffstat (limited to 'git-checkout.html')
| -rw-r--r-- | git-checkout.html | 229 |
1 files changed, 20 insertions, 209 deletions
diff --git a/git-checkout.html b/git-checkout.html index db285b12d..0da5e42e2 100644 --- a/git-checkout.html +++ b/git-checkout.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 9.0.0rc2" />
+<meta name="generator" content="AsciiDoc 10.0.1" />
<title>git-checkout(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -539,195 +539,6 @@ body.manpage div.sectionbody { </style>
<script type="text/javascript">
/*<+'])');
- // Function that scans the DOM tree for header elements (the DOM2
- // nodeIterator API would be a better technique but not supported by all
- // browsers).
- var iterate = function (el) {
- for (var i = el.firstChild; i != null; i = i.nextSibling) {
- if (i.nodeType == 1 /* Node.ELEMENT_NODE */) {
- var mo = re.exec(i.tagName);
- if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") {
- result[result.length] = new TocEntry(i, getText(i), mo[1]-1);
- }
- iterate(i);
- }
- }
- }
- iterate(el);
- return result;
- }
-
- 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];
- if (entry.element.id == "")
- entry.element.id = "_toc_" + i;
- var a = document.createElement("a");
- a.href = "#" + entry.element.id;
- a.appendChild(document.createTextNode(entry.text));
- var div = document.createElement("div");
- div.appendChild(a);
- div.className = "toclevel" + entry.toclevel;
- toc.appendChild(div);
- }
- if (entries.length == 0)
- toc.parentNode.removeChild(toc);
-},
-
-
-/////////////////////////////////////////////////////////////////////
-// Footnotes generator
-/////////////////////////////////////////////////////////////////////
-
-/* Based on footnote generation code from:
- * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
- */
-
-footnotes: function () {
- // 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++;
- 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>";
- var id =spans[i].getAttribute("id");
- if (id != null) refs["#"+id] = n;
- }
- }
- if (n == 0)
- noteholder.parentNode.removeChild(noteholder);
- else {
- // Process footnoterefs.
- for (i=0; i<spans.length; i++) {
- if (spans[i].className == "footnoteref") {
- var href = spans[i].getElementsByTagName("a")[0].getAttribute("href");
- href = href.match(/#.*/)[0]; // Because IE return full URL.
- n = refs[href];
- spans[i].innerHTML =
- "[<a href='#_footnote_" + n +
- "' title='View footnote' class='footnote'>" + n + "</a>]";
- }
- }
- }
-},
-
-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>
@@ -752,7 +563,7 @@ git-checkout(1) Manual Page <pre class="content"><em>git checkout</em> [-q] [-f] [-m] [<branch>]
<em>git checkout</em> [-q] [-f] [-m] --detach [<branch>]
<em>git checkout</em> [-q] [-f] [-m] [--detach] <commit>
-<em>git checkout</em> [-q] [-f] [-m] [[-b|-B|--orphan] <new_branch>] [<start_point>]
+<em>git checkout</em> [-q] [-f] [-m] [[-b|-B|--orphan] <new-branch>] [<start-point>]
<em>git checkout</em> [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] <pathspec>…
<em>git checkout</em> [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] --pathspec-from-file=<file> [--pathspec-file-nul]
<em>git checkout</em> (-p|--patch) [<tree-ish>] [--] [<pathspec>…]</pre>
@@ -792,7 +603,7 @@ rather expensive side-effects to show only the tracking information, if exists, for the current branch.</p></div>
</dd>
<dt class="hdlist1">
-<em>git checkout</em> -b|-B <new_branch> [<start point>]
+<em>git checkout</em> -b|-B <new-branch> [<start-point>]
</dt>
<dd>
<p>
@@ -803,11 +614,11 @@ if exists, for the current branch.</p></div> <code>--track</code> without <code>-b</code> implies branch creation; see the
description of <code>--track</code> below.
</p>
-<div class="paragraph"><p>If <code>-B</code> is given, <code><new_branch></code> is created if it doesn’t exist; otherwise, it
+<div class="paragraph"><p>If <code>-B</code> is given, <code><new-branch></code> is created if it doesn’t exist; otherwise, it
is reset. This is the transactional equivalent of</p></div>
<div class="listingblock">
<div class="content">
-<pre><code>$ git branch -f <branch> [<start point>]
+<pre><code>$ git branch -f <branch> [<start-point>]
$ git checkout <branch></code></pre>
</div></div>
<div class="paragraph"><p>that is to say, the branch is not reset/created unless "git checkout" is
@@ -940,21 +751,21 @@ on your side branch as <code>theirs</code> (i.e. "one contributor’s work o of it").</p></div>
</dd>
<dt class="hdlist1">
--b <new_branch>
+-b <new-branch>
</dt>
<dd>
<p>
- Create a new branch named <code><new_branch></code> and start it at
- <code><start_point></code>; see <a href="git-branch.html">git-branch(1)</a> for details.
+ Create a new branch named <code><new-branch></code> and start it at
+ <code><start-point></code>; see <a href="git-branch.html">git-branch(1)</a> for details.
</p>
</dd>
<dt class="hdlist1">
--B <new_branch>
+-B <new-branch>
</dt>
<dd>
<p>
- Creates the branch <code><new_branch></code> and start it at <code><start_point></code>;
- if it already exists, then reset it to <code><start_point></code>. This is
+ Creates the branch <code><new-branch></code> and start it at <code><start-point></code>;
+ if it already exists, then reset it to <code><start-point></code>. This is
equivalent to running "git branch" with "-f"; see
<a href="git-branch.html">git-branch(1)</a> for details.
</p>
@@ -1042,19 +853,19 @@ variable.</p></div> </p>
</dd>
<dt class="hdlist1">
---orphan <new_branch>
+--orphan <new-branch>
</dt>
<dd>
<p>
- Create a new <em>orphan</em> branch, named <code><new_branch></code>, started from
- <code><start_point></code> and switch to it. The first commit made on this
+ Create a new <em>orphan</em> branch, named <code><new-branch></code>, started from
+ <code><start-point></code> and switch to it. The first commit made on this
new branch will have no parents and it will be the root of a new
history totally disconnected from all the other branches and
commits.
</p>
<div class="paragraph"><p>The index and the working tree are adjusted as if you had previously run
-<code>git checkout <start_point></code>. This allows you to start a new history
-that records a set of paths similar to <code><start_point></code> by easily running
+<code>git checkout <start-point></code>. This allows you to start a new history
+that records a set of paths similar to <code><start-point></code> by easily running
<code>git commit -a</code> to make the root commit.</p></div>
<div class="paragraph"><p>This can be useful when you want to publish the tree from a commit
without exposing its full history. You might want to do this to publish
@@ -1062,7 +873,7 @@ an open source branch of a project whose current tree is "clean", but whose full history contains proprietary or otherwise encumbered bits of
code.</p></div>
<div class="paragraph"><p>If you want to start a disconnected history that records a set of paths
-that is totally different from the one of <code><start_point></code>, then you should
+that is totally different from the one of <code><start-point></code>, then you should
clear the index and the working tree right after creating the orphan
branch by running <code>git rm -rf .</code> from the top level of the working tree.
Afterwards you will be ready to prepare your new files, repopulating the
@@ -1233,7 +1044,7 @@ merge base of <code>A</code> and <code>B</code> if there is exactly one merge ba leave out at most one of <code>A</code> and <code>B</code>, in which case it defaults to <code>HEAD</code>.</p></div>
</dd>
<dt class="hdlist1">
-<new_branch>
+<new-branch>
</dt>
<dd>
<p>
@@ -1241,7 +1052,7 @@ leave out at most one of <code>A</code> and <code>B</code>, in which case it def </p>
</dd>
<dt class="hdlist1">
-<start_point>
+<start-point>
</dt>
<dd>
<p>
@@ -1561,7 +1372,7 @@ $ git add frotz</code></pre> <div id="footer">
<div id="footer-text">
Last updated
- 2021-10-14 10:10:01 PDT
+ 2021-12-10 14:52:02 PST
</div>
</div>
</body>
|