From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: "Elijah Newren" <newren@gmail.com>,
"Mathias Kunter" <mathiaskunter@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Ramkumar Ramachandra" <r@artagnon.com>,
"Jeff King" <peff@peff.net>, "René Scharfe" <l.s.r@web.de>,
"Matthieu Moy" <git@matthieu-moy.fr>,
"Junio C Hamano" <gitster@pobox.com>,
"Felipe Contreras" <felipe.contreras@gmail.com>
Subject: [PATCH 11/11] doc: push: explain default=simple correctly
Date: Fri, 28 May 2021 15:10:14 -0500 [thread overview]
Message-ID: <20210528201014.2175179-12-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20210528201014.2175179-1-felipe.contreras@gmail.com>
Now that the code has been unconvolutized and it's clear what it's
actually doing, update the documentation to reflect that.
Namely; the simple mode only barfs when working on a centralized
workflow, and there's no configured upstream branch with the same name.
Cc: Elijah Newren <newren@gmail.com>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
Documentation/config/push.txt | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/Documentation/config/push.txt b/Documentation/config/push.txt
index f2667b2689..632033638c 100644
--- a/Documentation/config/push.txt
+++ b/Documentation/config/push.txt
@@ -24,15 +24,14 @@ push.default::
* `tracking` - This is a deprecated synonym for `upstream`.
-* `simple` - in centralized workflow, work like `upstream` with an
- added safety to refuse to push if the upstream branch's name is
- different from the local one.
+* `simple` - pushes the current branch with the same name on the remote.
+
-When pushing to a remote that is different from the remote you normally
-pull from, work as `current`. This is the safest option and is suited
-for beginners.
+If you are working on a centralized workflow (pushing to the same repository you
+pull from, which is typically `origin`), then you need to configure an upstream
+branch with the same name.
+
-This mode has become the default in Git 2.0.
+This mode is the default since Git 2.0, and is the safest option suited for
+beginners.
* `matching` - push all branches having the same name on both ends.
This makes the repository you are pushing to remember the set of
--
2.32.0.rc0
next prev parent reply other threads:[~2021-05-28 20:10 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-28 20:10 [PATCH 00/11] Unconvolutize push.default=simple Felipe Contreras
2021-05-28 20:10 ` [PATCH 01/11] push: hedge code of default=simple Felipe Contreras
2021-05-28 20:10 ` [PATCH 02/11] push: move code to setup_push_simple() Felipe Contreras
2021-05-28 20:10 ` [PATCH 03/11] push: reorganize setup_push_simple() Felipe Contreras
2021-05-28 20:52 ` Elijah Newren
2021-05-28 21:27 ` Felipe Contreras
2021-05-28 21:42 ` Elijah Newren
2021-05-28 20:10 ` [PATCH 04/11] push: simplify setup_push_simple() Felipe Contreras
2021-05-28 20:57 ` Elijah Newren
2021-05-28 21:28 ` Felipe Contreras
2021-05-28 20:10 ` [PATCH 05/11] push: remove unused code in setup_push_upstream() Felipe Contreras
2021-05-28 20:10 ` [PATCH 06/11] push: merge current and simple Felipe Contreras
2021-05-28 20:10 ` [PATCH 07/11] push: remove redundant check Felipe Contreras
2021-05-28 20:10 ` [PATCH 08/11] push: fix Yoda condition Felipe Contreras
2021-05-28 20:10 ` [PATCH 09/11] push: remove trivial function Felipe Contreras
2021-05-28 20:10 ` [PATCH 10/11] push: flip !triangular for centralized Felipe Contreras
2021-05-28 21:05 ` Elijah Newren
2021-05-28 21:57 ` Felipe Contreras
2021-05-28 20:10 ` Felipe Contreras [this message]
2021-05-28 21:07 ` [PATCH 11/11] doc: push: explain default=simple correctly Elijah Newren
2021-05-29 5:38 ` Bagas Sanjaya
2021-05-28 21:17 ` [PATCH 00/11] Unconvolutize push.default=simple Elijah Newren
2021-05-28 22:21 ` Felipe Contreras
2021-05-28 22:28 ` Elijah Newren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210528201014.2175179-12-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=avarab@gmail.com \
--cc=git@matthieu-moy.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=l.s.r@web.de \
--cc=mathiaskunter@gmail.com \
--cc=newren@gmail.com \
--cc=peff@peff.net \
--cc=r@artagnon.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).