diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-01-10 11:52:54 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-01-10 11:52:54 -0800 |
commit | 0669bdf4ebc095a2b26654292e1ff38245ccf88a (patch) | |
tree | e1cbee05b782fabade7aefc3767ffdbf28f75dfd /Documentation/git-switch.txt | |
parent | 4b51386bbfc5d26e552c3c4be135e31cd2f64b44 (diff) | |
parent | 44f14a9d24cd9f04a0a789e58968d52d44d7f332 (diff) | |
download | git-0669bdf4ebc095a2b26654292e1ff38245ccf88a.tar.gz |
Merge branch 'js/branch-track-inherit'
"git -c branch.autosetupmerge=inherit branch new old" makes "new"
to have the same upstream as the "old" branch, instead of marking
"old" itself as its upstream.
* js/branch-track-inherit:
config: require lowercase for branch.*.autosetupmerge
branch: add flags and config to inherit tracking
branch: accept multiple upstream branches for tracking
Diffstat (limited to 'Documentation/git-switch.txt')
-rw-r--r-- | Documentation/git-switch.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-switch.txt b/Documentation/git-switch.txt index 5c90f76fbe..bbcbdceb45 100644 --- a/Documentation/git-switch.txt +++ b/Documentation/git-switch.txt @@ -151,7 +151,7 @@ should result in deletion of the path). attached to a terminal, regardless of `--quiet`. -t:: ---track:: +--track [direct|inherit]:: When creating a new branch, set up "upstream" configuration. `-c` is implied. See `--track` in linkgit:git-branch[1] for details. |