From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 26 May 2022 21:51:30 +0000 (-0700)
Subject: Merge branch 'tk/simple-autosetupmerge'
X-Git-Tag: v2.37.0-rc0~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f49c478f628910de206c5e882a3cd3abec76d4e6;p=thirdparty%2Fgit.git

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
---

f49c478f628910de206c5e882a3cd3abec76d4e6