From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 13 Jul 2021 23:52:49 +0000 (-0700)
Subject: Merge branch 'fc/push-simple-updates'
X-Git-Tag: v2.33.0-rc0~69
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07e230d762bde9ce5fa41384efb8caed4c7de684;p=thirdparty%2Fgit.git

Merge branch 'fc/push-simple-updates'

Some code and doc clarification around "git push".

* fc/push-simple-updates:
  doc: push: explain default=simple correctly
  push: remove unused code in setup_push_upstream()
  push: simplify setup_push_simple()
  push: reorganize setup_push_simple()
  push: copy code to setup_push_simple()
  push: hedge code of default=simple
  push: rename !triangular to same_remote
---

07e230d762bde9ce5fa41384efb8caed4c7de684