doc: clarify push.default=simple behavior
The documentation for the 'simple' push mode currently singles out the centralized workflow, which can cause confusion about its behavior in other scenarios, such as triangular workflows. Clarify that 'simple' always pushes the current branch to a branch of the same name, but only enforces the strict upstream tracking requirement when pushing back to the same remote being pulled from. Suggested-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Ivan Baluta <ivanbaluta.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>main
parent
56a4f3c3a2
commit
b2040bfafe
|
|
@ -41,9 +41,10 @@ this is a deprecated synonym for `upstream`.
|
|||
`simple`;;
|
||||
push the current branch with the same name on the remote.
|
||||
+
|
||||
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 requires that the remote repository to be pushed to is
|
||||
known. When pushing back to the same remote you pull from, the
|
||||
current branch must also have an upstream tracking branch with the
|
||||
same name.
|
||||
+
|
||||
This mode is the default since Git 2.0, and is the safest option suited for
|
||||
beginners.
|
||||
|
|
|
|||
Loading…
Reference in New Issue