diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-05-26 16:14:04 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-05-26 16:14:04 -0700 |
commit | 37db4adefc0c0079c7bd9343cfc35eace75ff54f (patch) | |
tree | d663b03e2c1d01d68d4e24eb09fd4d29feb1f272 /git-config.html | |
parent | d71b075d5f09f89574e2c5ea5ad451d15e229584 (diff) | |
download | git-htmldocs-37db4adefc0c0079c7bd9343cfc35eace75ff54f.tar.gz |
Autogenerated HTML docs for v2.36.1-195-g8ddf5
Diffstat (limited to 'git-config.html')
-rw-r--r-- | git-config.html | 37 |
1 files changed, 34 insertions, 3 deletions
diff --git a/git-config.html b/git-config.html index f6a9ffe9d..c1abb877e 100644 --- a/git-config.html +++ b/git-config.html @@ -3515,7 +3515,9 @@ branch.autoSetupMerge starting point is a remote-tracking branch; <code>always</code> —  automatic setup is done when the starting point is either a
local branch or remote-tracking branch; <code>inherit</code> — if the starting point
has a tracking configuration, it is copied to the new
- branch. This option defaults to true.
+ branch; <code>simple</code> — automatic setup is done only when the starting point
+ is a remote-tracking branch and the new branch has the same name as the
+ remote branch. This option defaults to true.
</p>
</dd>
<dt class="hdlist1">
@@ -3559,8 +3561,9 @@ branch.<name>.remote may be overridden with <code>remote.pushDefault</code> (for all branches).
The remote to push to, for the current branch, may be further
overridden by <code>branch.<name>.pushRemote</code>. If no remote is
- configured, or if you are not on any branch, it defaults to
- <code>origin</code> for fetching and <code>remote.pushDefault</code> for pushing.
+ configured, or if you are not on any branch and there is more than
+ one remote defined in the repository, it defaults to <code>origin</code> for
+ fetching and <code>remote.pushDefault</code> for pushing.
Additionally, <code>.</code> (a period) is the current local repository
(a dot-repository), see <code>branch.<name>.merge</code>'s final note below.
</p>
@@ -8885,6 +8888,22 @@ pull.twohead </p>
</dd>
<dt class="hdlist1">
+push.autoSetupRemote
+</dt>
+<dd>
+<p>
+ If set to "true" assume <code>--set-upstream</code> on default push when no
+ upstream tracking exists for the current branch; this option
+ takes effect with push.default options <em>simple</em>, <em>upstream</em>,
+ and <em>current</em>. It is useful if by default you want new branches
+ to be pushed to the default remote (like the behavior of
+ <em>push.default=current</em>) and you also want the upstream tracking
+ to be set. Workflows most likely to benefit from this option are
+ <em>simple</em> central workflows where all branches are expected to
+ have the same name on the remote.
+</p>
+</dd>
+<dt class="hdlist1">
push.default
</dt>
<dd>
@@ -9706,6 +9725,18 @@ directory was listed in the <code>safe.directory</code> list. If <code>safe.dire is set in system config and you want to re-enable this protection, then
initialize your list with an empty value before listing the repositories
that you deem safe.</p></div>
+<div class="paragraph"><p>As explained, Git only allows you to access repositories owned by
+yourself, i.e. the user who is running Git, by default. When Git
+is running as <em>root</em> in a non Windows platform that provides sudo,
+ however, git checks the SUDO_UID environment variable that sudo creates
+and will allow access to the uid recorded as its value instead.
+This is to make it easy to perform a common sequence during installation
+"make && sudo make install". A git process running under <em>sudo</em> runs as
+<em>root</em> but the <em>sudo</em> command exports the environment variable to record
+which id the original user has.
+If that is not what you would prefer and want git to only trust
+repositories that are owned by root instead, then you must remove
+the <code>SUDO_UID</code> variable from root’s environment before invoking git.</p></div>
</dd>
<dt class="hdlist1">
sendemail.identity
|