Skip to content

Commit 90cfb26

Browse files
felipecgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Felipe Contreras <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 7e6d72b commit 90cfb26

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

Documentation/config/push.txt

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,14 @@ push.default::
2424

2525
* `tracking` - This is a deprecated synonym for `upstream`.
2626

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.
3028
+
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.
3432
+
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.
3635

3736
* `matching` - push all branches having the same name on both ends.
3837
This makes the repository you are pushing to remember the set of

0 commit comments

Comments
 (0)