diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-01-20 16:16:11 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-01-20 16:16:11 -0800 |
commit | 1abf8e880de22795d0f5e3336241c3eded33de99 (patch) | |
tree | 14b36434d6ec791db0fbd08bea76be031e2341a6 | |
parent | 29034adaee3e9bab6a318e9b4683081b29b8b3b7 (diff) | |
download | git-htmldocs-1abf8e880de22795d0f5e3336241c3eded33de99.tar.gz |
Autogenerated HTML docs for v2.35.0-rc2-2-g297ca
-rw-r--r-- | git-branch.html | 14 | ||||
-rw-r--r-- | git-branch.txt | 12 | ||||
-rw-r--r-- | git-checkout.html | 4 | ||||
-rw-r--r-- | git-checkout.txt | 2 | ||||
-rw-r--r-- | howto/coordinate-embargoed-releases.html | 2 | ||||
-rw-r--r-- | howto/keep-canonical-history-correct.html | 2 | ||||
-rw-r--r-- | howto/maintain-git.html | 2 | ||||
-rw-r--r-- | howto/new-command.html | 2 | ||||
-rw-r--r-- | howto/rebase-from-internal-branch.html | 2 | ||||
-rw-r--r-- | howto/rebuild-from-update-hook.html | 2 | ||||
-rw-r--r-- | howto/recover-corrupted-blob-object.html | 2 | ||||
-rw-r--r-- | howto/recover-corrupted-object-harder.html | 2 | ||||
-rw-r--r-- | howto/revert-a-faulty-merge.html | 2 | ||||
-rw-r--r-- | howto/revert-branch-rebase.html | 2 | ||||
-rw-r--r-- | howto/separating-topic-branches.html | 2 | ||||
-rw-r--r-- | howto/setup-git-server-over-http.html | 2 | ||||
-rw-r--r-- | howto/update-hook-example.html | 2 | ||||
-rw-r--r-- | howto/use-git-daemon.html | 2 | ||||
-rw-r--r-- | howto/using-merge-subtree.html | 2 | ||||
-rw-r--r-- | howto/using-signed-tag-in-pull-request.html | 2 |
20 files changed, 32 insertions, 32 deletions
diff --git a/git-branch.html b/git-branch.html index cca3ef6da..421b0564e 100644 --- a/git-branch.html +++ b/git-branch.html @@ -757,7 +757,7 @@ git-branch(1) Manual Page [--points-at <object>] [--format=<format>]
[(-r | --remotes) | (-a | --all)]
[--list] [<pattern>…]
-<em>git branch</em> [--track [direct|inherit] | --no-track] [-f] <branchname> [<start-point>]
+<em>git branch</em> [--track[=(direct|inherit)] | --no-track] [-f] <branchname> [<start-point>]
<em>git branch</em> (--set-upstream-to=<upstream> | -u <upstream>) [<branchname>]
<em>git branch</em> --unset-upstream [<branchname>]
<em>git branch</em> (-m | -M) [<oldbranch>] <newbranch>
@@ -1068,7 +1068,7 @@ way to clean up all obsolete remote-tracking branches.</p></div> -t
</dt>
<dt class="hdlist1">
---track [inherit|direct]
+--track[=(direct|inherit)]
</dt>
<dd>
<p>
@@ -1081,10 +1081,10 @@ way to clean up all obsolete remote-tracking branches.</p></div> upstream when the new branch is checked out.
</p>
<div class="paragraph"><p>The exact upstream branch is chosen depending on the optional argument:
-<code>--track</code> or <code>--track direct</code> means to use the start-point branch itself as the
-upstream; <code>--track inherit</code> means to copy the upstream configuration of the
-start-point branch.</p></div>
-<div class="paragraph"><p><code>--track direct</code> is the default when the start point is a remote-tracking branch.
+<code>-t</code>, <code>--track</code>, or <code>--track=direct</code> means to use the start-point branch
+itself as the upstream; <code>--track=inherit</code> means to copy the upstream
+configuration of the start-point branch.</p></div>
+<div class="paragraph"><p><code>--track=direct</code> is the default when the start point is a remote-tracking branch.
Set the branch.autoSetupMerge configuration variable to <code>false</code> if you
want <code>git switch</code>, <code>git checkout</code> and <code>git branch</code> to always behave as if <code>--no-track</code>
were given. Set it to <code>always</code> if you want this behavior when the
@@ -1406,7 +1406,7 @@ a branch?”</a> in the Git User’s Manual.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-01-10 13:33:11 PST
+ 2022-01-20 16:14:41 PST
</div>
</div>
</body>
diff --git a/git-branch.txt b/git-branch.txt index 2d52ae396..731e340cb 100644 --- a/git-branch.txt +++ b/git-branch.txt @@ -16,7 +16,7 @@ SYNOPSIS [--points-at <object>] [--format=<format>] [(-r | --remotes) | (-a | --all)] [--list] [<pattern>...] -'git branch' [--track [direct|inherit] | --no-track] [-f] <branchname> [<start-point>] +'git branch' [--track[=(direct|inherit)] | --no-track] [-f] <branchname> [<start-point>] 'git branch' (--set-upstream-to=<upstream> | -u <upstream>) [<branchname>] 'git branch' --unset-upstream [<branchname>] 'git branch' (-m | -M) [<oldbranch>] <newbranch> @@ -206,7 +206,7 @@ This option is only applicable in non-verbose mode. Display the full sha1s in the output listing rather than abbreviating them. -t:: ---track [inherit|direct]:: +--track[=(direct|inherit)]:: When creating a new branch, set up `branch.<name>.remote` and `branch.<name>.merge` configuration entries to set "upstream" tracking configuration for the new branch. This @@ -216,11 +216,11 @@ This option is only applicable in non-verbose mode. upstream when the new branch is checked out. + The exact upstream branch is chosen depending on the optional argument: -`--track` or `--track direct` means to use the start-point branch itself as the -upstream; `--track inherit` means to copy the upstream configuration of the -start-point branch. +`-t`, `--track`, or `--track=direct` means to use the start-point branch +itself as the upstream; `--track=inherit` means to copy the upstream +configuration of the start-point branch. + -`--track direct` is the default when the start point is a remote-tracking branch. +`--track=direct` is the default when the start point is a remote-tracking branch. Set the branch.autoSetupMerge configuration variable to `false` if you want `git switch`, `git checkout` and `git branch` to always behave as if `--no-track` were given. Set it to `always` if you want this behavior when the diff --git a/git-checkout.html b/git-checkout.html index 59a3cdad3..574ab2bd3 100644 --- a/git-checkout.html +++ b/git-checkout.html @@ -963,7 +963,7 @@ of it").</p></div> -t
</dt>
<dt class="hdlist1">
---track [direct|inherit]
+--track[=(direct|inherit)]
</dt>
<dd>
<p>
@@ -1560,7 +1560,7 @@ $ git add frotz</code></pre> <div id="footer">
<div id="footer-text">
Last updated
- 2022-01-10 13:33:11 PST
+ 2022-01-20 16:14:41 PST
</div>
</div>
</body>
diff --git a/git-checkout.txt b/git-checkout.txt index 2a90ea6cd..9f37e22e1 100644 --- a/git-checkout.txt +++ b/git-checkout.txt @@ -156,7 +156,7 @@ of it"). linkgit:git-branch[1] for details. -t:: ---track [direct|inherit]:: +--track[=(direct|inherit)]:: When creating a new branch, set up "upstream" configuration. See "--track" in linkgit:git-branch[1] for details. + diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html index 332bd666f..77e29dae5 100644 --- a/howto/coordinate-embargoed-releases.html +++ b/howto/coordinate-embargoed-releases.html @@ -873,7 +873,7 @@ Thanks, <div id="footer">
<div id="footer-text">
Last updated
- 2022-01-19 13:48:42 PST
+ 2022-01-20 16:15:05 PST
</div>
</div>
</body>
diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html index caaf0af0e..9df61ab68 100644 --- a/howto/keep-canonical-history-correct.html +++ b/howto/keep-canonical-history-correct.html @@ -938,7 +938,7 @@ tip of your <em>master</em> again and redo the two merges:</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-01-19 13:48:42 PST
+ 2022-01-20 16:15:05 PST
</div>
</div>
</body>
diff --git a/howto/maintain-git.html b/howto/maintain-git.html index 22cdf58c6..1b9564cab 100644 --- a/howto/maintain-git.html +++ b/howto/maintain-git.html @@ -1469,7 +1469,7 @@ $ git update-ref -d $mf/ai/topic</code></pre> <div id="footer">
<div id="footer-text">
Last updated
- 2022-01-19 13:48:42 PST
+ 2022-01-20 16:15:05 PST
</div>
</div>
</body>
diff --git a/howto/new-command.html b/howto/new-command.html index c380d3a8b..0b516654f 100644 --- a/howto/new-command.html +++ b/howto/new-command.html @@ -863,7 +863,7 @@ letter [PATCH 0/n]. <div id="footer">
<div id="footer-text">
Last updated
- 2022-01-19 13:48:40 PST
+ 2022-01-20 16:15:03 PST
</div>
</div>
</body>
diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html index 4f2711955..f8df96f4f 100644 --- a/howto/rebase-from-internal-branch.html +++ b/howto/rebase-from-internal-branch.html @@ -895,7 +895,7 @@ the #1' commit.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-01-19 13:48:42 PST
+ 2022-01-20 16:15:05 PST
</div>
</div>
</body>
diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html index 46cc3d469..93ede2668 100644 --- a/howto/rebuild-from-update-hook.html +++ b/howto/rebuild-from-update-hook.html @@ -847,7 +847,7 @@ This is still crude and does not protect against simultaneous <div id="footer">
<div id="footer-text">
Last updated
- 2022-01-19 13:48:42 PST
+ 2022-01-20 16:15:05 PST
</div>
</div>
</body>
diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html index 7c1359b41..b220dd4ff 100644 --- a/howto/recover-corrupted-blob-object.html +++ b/howto/recover-corrupted-blob-object.html @@ -880,7 +880,7 @@ thing.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-01-19 13:48:42 PST
+ 2022-01-20 16:15:05 PST
</div>
</div>
</body>
diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html index 1e0b3c0d6..f092fe896 100644 --- a/howto/recover-corrupted-object-harder.html +++ b/howto/recover-corrupted-object-harder.html @@ -1189,7 +1189,7 @@ int main(int argc, char **argv) <div id="footer">
<div id="footer-text">
Last updated
- 2022-01-19 13:48:42 PST
+ 2022-01-20 16:15:05 PST
</div>
</div>
</body>
diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html index 438886f72..a55c9ed2b 100644 --- a/howto/revert-a-faulty-merge.html +++ b/howto/revert-a-faulty-merge.html @@ -1025,7 +1025,7 @@ P---o---o---M---x---x---W---x---M2 <div id="footer">
<div id="footer-text">
Last updated
- 2022-01-19 13:48:41 PST
+ 2022-01-20 16:15:05 PST
</div>
</div>
</body>
diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html index 55eba5731..98e0d6ea2 100644 --- a/howto/revert-branch-rebase.html +++ b/howto/revert-branch-rebase.html @@ -907,7 +907,7 @@ Committed merge 7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f <div id="footer">
<div id="footer-text">
Last updated
- 2022-01-19 13:48:41 PST
+ 2022-01-20 16:15:04 PST
</div>
</div>
</body>
diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html index 8a7b2e091..291e38ea6 100644 --- a/howto/separating-topic-branches.html +++ b/howto/separating-topic-branches.html @@ -841,7 +841,7 @@ o---o"master"</code></pre> <div id="footer">
<div id="footer-text">
Last updated
- 2022-01-19 13:48:41 PST
+ 2022-01-20 16:15:04 PST
</div>
</div>
</body>
diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html index a0adb7a20..9f9425c83 100644 --- a/howto/setup-git-server-over-http.html +++ b/howto/setup-git-server-over-http.html @@ -1071,7 +1071,7 @@ help diagnosing the problem, but removes security checks.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-01-19 13:48:41 PST
+ 2022-01-20 16:15:04 PST
</div>
</div>
</body>
diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html index 73918f548..cc85e559c 100644 --- a/howto/update-hook-example.html +++ b/howto/update-hook-example.html @@ -930,7 +930,7 @@ that JC can make non-fast-forward pushes on it.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-01-19 13:48:41 PST
+ 2022-01-20 16:15:04 PST
</div>
</div>
</body>
diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html index ebd3dfac0..9cdeb676c 100644 --- a/howto/use-git-daemon.html +++ b/howto/use-git-daemon.html @@ -791,7 +791,7 @@ a good practice to put the paths after a "--" separator.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-01-19 13:48:41 PST
+ 2022-01-20 16:15:04 PST
</div>
</div>
</body>
diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html index c4986428b..e724ef933 100644 --- a/howto/using-merge-subtree.html +++ b/howto/using-merge-subtree.html @@ -848,7 +848,7 @@ Please note that if the other project merges from you, then it will <div id="footer">
<div id="footer-text">
Last updated
- 2022-01-19 13:48:41 PST
+ 2022-01-20 16:15:04 PST
</div>
</div>
</body>
diff --git a/howto/using-signed-tag-in-pull-request.html b/howto/using-signed-tag-in-pull-request.html index 5810996be..9bea9b208 100644 --- a/howto/using-signed-tag-in-pull-request.html +++ b/howto/using-signed-tag-in-pull-request.html @@ -952,7 +952,7 @@ as part of the merge commit.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-01-19 13:48:41 PST
+ 2022-01-20 16:15:04 PST
</div>
</div>
</body>
|