Merge branch 'fc/push-simple-updates' into jch
authorJunio C Hamano <gitster@pobox.com>
Thu, 17 Jun 2021 02:26:15 +0000 (11:26 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 17 Jun 2021 02:26:15 +0000 (11:26 +0900)
commitf3333372eda8ae8856b7f9b3bf5a45ab2d61ab3b
tree3b42a4896aba4e3acd99692d51f339298735faa6
parent7588ab2ed539cb51c225c5f438eb61d18edb5bd5
parent90cfb2666b5913e0be4ffb84630866287dde4f9a
Merge branch 'fc/push-simple-updates' into jch

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
Documentation/config/push.txt