Re: [PATCH v2] doc: clarify push.default=simple behavior

[Junio C Hamano <gitster@pobox.com>]

"Ivan Baluta via GitGitGadget" <gitgitgadget@gmail.com> writes:

> From: Ivan Baluta <ivanbaluta.dev@gmail.com>
>
> 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>
> ---
>     doc: clarify push.default=simple in triangular workflows
>
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-2115%2Fivanbaluta%2Fdoc-push-simple-triangular-v2
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-2115/ivanbaluta/doc-push-simple-triangular-v2
> Pull-Request: https://github.com/gitgitgadget/git/pull/2115

Looking good.  Thanks.

> diff --git a/Documentation/config/push.adoc b/Documentation/config/push.adoc
> index d9112b2260..28132eedfe 100644
> --- a/Documentation/config/push.adoc
> +++ b/Documentation/config/push.adoc
> @@ -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.
>
> base-commit: 59ff4886a579f4bc91e976fe18590b9ae02c7a08