diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-01-10 13:34:48 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-01-10 13:34:48 -0800 |
| commit | 9d060b84d900083fb1b577b976fa963a715efc71 (patch) | |
| tree | 4b6f08c7e7a395bfb536312ffe41658cecb6d4a9 /git-config.html | |
| parent | e872a1cfb365aa9016e685705d691f75c4585220 (diff) | |
| download | git-htmldocs-9d060b84d900083fb1b577b976fa963a715efc71.tar.gz | |
Autogenerated HTML docs for v2.35.0-rc0
Diffstat (limited to 'git-config.html')
| -rw-r--r-- | git-config.html | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-config.html b/git-config.html index c9e17ac3a..885629309 100644 --- a/git-config.html +++ b/git-config.html @@ -3299,7 +3299,8 @@ branch.autoSetupMerge and <code>--no-track</code> options. The valid settings are: <code>false</code> — no
automatic setup is done; <code>true</code> — automatic setup is done when the
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
+ 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.
</p>
</dd>
|