]> git.ipfire.org Git - thirdparty/git.git/commit - branch.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4b51386 44f14a9)
Merge branch 'js/branch-track-inherit'
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 Jan 2022 19:52:54 +0000 (11:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Jan 2022 19:52:54 +0000 (11:52 -0800)
commit0669bdf4ebc095a2b26654292e1ff38245ccf88a
treee1cbee05b782fabade7aefc3767ffdbf28f75dfdtree | snapshot
parent4b51386bbfc5d26e552c3c4be135e31cd2f64b44commit | diff
parent44f14a9d24cd9f04a0a789e58968d52d44d7f332commit | diff
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
Documentation/config/branch.txt diff1 | diff2 | blob | history
Documentation/git-branch.txt diff1 | diff2 | blob | history
Documentation/git-checkout.txt diff1 | diff2 | blob | history
Documentation/git-switch.txt diff1 | diff2 | blob | history
branch.c diff1 | diff2 | blob | history
builtin/branch.c diff1 | diff2 | blob | history
builtin/checkout.c diff1 | diff2 | blob | history
config.c diff1 | diff2 | blob | history
parse-options.h diff1 | diff2 | blob | history
t/t2017-checkout-orphan.sh diff1 | diff2 | blob | history
t/t3200-branch.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.