Thread (24 messages) flat view 24 messages, 3 authors, 2021-05-29

Re: [PATCH 11/11] doc: push: explain default=simple correctly

From: Elijah Newren <hidden>
Date: 2021-05-28 21:07:22

On Fri, May 28, 2021 at 1:10 PM Felipe Contreras
[off-list ref] wrote:
quoted hunk ↗ jump to hunk
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 <redacted>
Signed-off-by: Felipe Contreras <redacted>
---
 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
Much clearer.  Well done.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help