tree e1cbee05b782fabade7aefc3767ffdbf28f75dfd
parent 4b51386bbfc5d26e552c3c4be135e31cd2f64b44
parent 44f14a9d24cd9f04a0a789e58968d52d44d7f332
author Junio C Hamano <gitster@pobox.com> 1641844374 -0800
committer Junio C Hamano <gitster@pobox.com> 1641844374 -0800

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