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-branch.txt | |
parent | d71b075d5f09f89574e2c5ea5ad451d15e229584 (diff) | |
download | git-htmldocs-37db4adefc0c0079c7bd9343cfc35eace75ff54f.tar.gz |
Autogenerated HTML docs for v2.36.1-195-g8ddf5
Diffstat (limited to 'git-branch.txt')
-rw-r--r-- | git-branch.txt | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/git-branch.txt b/git-branch.txt index c8b4f9ce3..ae8237834 100644 --- a/git-branch.txt +++ b/git-branch.txt @@ -221,13 +221,17 @@ The exact upstream branch is chosen depending on the optional argument: 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. -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 -start-point is either a local or remote-tracking branch. Set it to -`inherit` if you want to copy the tracking configuration from the -branch point. +The branch.autoSetupMerge configuration variable specifies how `git switch`, +`git checkout` and `git branch` should behave when neither `--track` nor +`--no-track` are specified: ++ +The default option, `true`, behaves as though `--track=direct` +were given whenever the start-point is a remote-tracking branch. +`false` behaves as if `--no-track` were given. `always` behaves as though +`--track=direct` were given. `inherit` behaves as though `--track=inherit` +were given. `simple` behaves as though `--track=direct` were given only when +the start-point is a remote-tracking branch and the new branch has the same +name as the remote branch. + See linkgit:git-pull[1] and linkgit:git-config[1] for additional discussion on how the `branch.<name>.remote` and `branch.<name>.merge` options are used. |