summaryrefslogtreecommitdiff
path: root/commit.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-05-26 14:51:30 -0700
committerJunio C Hamano <gitster@pobox.com>2022-05-26 14:51:30 -0700
commitf49c478f628910de206c5e882a3cd3abec76d4e6 (patch)
treede71e2834c8cd48e6c2aaf447453d408d67fced0 /commit.c
parent6afdb07b7b918ed9282ea6e955f53369df862be8 (diff)
parent05d57750c66e4b58233787954c06b8f714bbee75 (diff)
Merge branch 'tk/simple-autosetupmerge'
"git -c branch.autosetupmerge=simple branch $A $B" will set the $B as $A's upstream only when $A and $B shares the same name, and "git -c push.default=simple" on branch $A would push to update the branch $A at the remote $B came from. Also more places use the sole remote, if exists, before defaulting to 'origin'. * tk/simple-autosetupmerge: push: new config option "push.autoSetupRemote" supports "simple" push push: default to single remote even when not named origin branch: new autosetupmerge option 'simple' for matching branches
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions