doc: push: explain default=simple correctly
Now that the code has been simplified 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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Felipe Contreras committed
May 31, 2021 at 14:32 UTC
90cfb2666b5913e0be4ffb84630866287dde4f9a
1 file changed
+6
-7
Documentation/config/push.txt
+6
-7
@@ -24,15 +24,14 @@ push.default::
24
25
* `tracking` - This is a deprecated synonym for `upstream`.
26
27
-* `simple` - in centralized workflow, work like `upstream` with an
28
- added safety to refuse to push if the upstream branch's name is
29
- different from the local one.
27
+* `simple` - pushes the current branch with the same name on the remote.
28
+
31
-When pushing to a remote that is different from the remote you normally
32
-pull from, work as `current`. This is the safest option and is suited
33
-for beginners.
29
+If you are working on a centralized workflow (pushing to the same repository you
30
+pull from, which is typically `origin`), then you need to configure an upstream
31
+branch with the same name.
32
+
35
-This mode has become the default in Git 2.0.
33
+This mode is the default since Git 2.0, and is the safest option suited for
34
+beginners.
35
36
* `matching` - push all branches having the same name on both ends.
37
This makes the repository you are pushing to remember the set of