]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'js/branch-track-inherit' into gc/branch-recurse-submodules
authorJunio C Hamano <gitster@pobox.com>
Mon, 31 Jan 2022 18:37:44 +0000 (10:37 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 31 Jan 2022 18:37:44 +0000 (10:37 -0800)
commit09e0be130d83ceedb3653d9a41768c6a13457ac5
tree466600cb071233316506ff31a3e9966679fb2908
parentabe6bb3905392d5eb6b01fa6e54d7e784e0522aa
parent6327f0efed36c64d98a140110171362b7cb75a52
Merge branch 'js/branch-track-inherit' into gc/branch-recurse-submodules

* js/branch-track-inherit:
  branch,checkout: fix --track documentation
  branch,checkout: fix --track usage strings
  config: require lowercase for branch.*.autosetupmerge
  branch: add flags and config to inherit tracking
  branch: accept multiple upstream branches for tracking
Documentation/config/branch.txt
Documentation/git-branch.txt
builtin/branch.c
config.c
parse-options.h
t/t3200-branch.sh