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 /builtin/commit.c | |
| parent | Merge branch 'ab/usage-die-message' (diff) | |
| parent | config: require lowercase for branch.*.autosetupmerge (diff) | |
| download | git-0669bdf4ebc095a2b26654292e1ff38245ccf88a.tar.gz git-0669bdf4ebc095a2b26654292e1ff38245ccf88a.zip | |
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 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions