From: Bagas Sanjaya <bagasdotme@gmail.com>
To: Felipe Contreras <felipe.contreras@gmail.com>, git@vger.kernel.org
Cc: "Elijah Newren" <newren@gmail.com>,
"Mathias Kunter" <mathiaskunter@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Ramkumar Ramachandra" <r@artagnon.com>,
"Jeff King" <peff@peff.net>, "René Scharfe" <l.s.r@web.de>,
"Matthieu Moy" <git@matthieu-moy.fr>,
"Junio C Hamano" <gitster@pobox.com>
Subject: Re: [PATCH 11/11] doc: push: explain default=simple correctly
Date: Sat, 29 May 2021 12:38:41 +0700 [thread overview]
Message-ID: <540e249f-6bf9-0e4f-51db-20ce3ef8e5bf@gmail.com> (raw)
In-Reply-To: <20210528201014.2175179-12-felipe.contreras@gmail.com>
On 29/05/21 03.10, Felipe Contreras wrote:
> 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
>
Grammar looks OK.
Reviewed-by: Bagas Sanjaya <bagasdotme@gmail.com>
--
An old man doll... just what I always wanted! - Clara
next prev parent reply other threads:[~2021-05-29 5:38 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-28 20:10 [PATCH 00/11] Unconvolutize push.default=simple Felipe Contreras
2021-05-28 20:10 ` [PATCH 01/11] push: hedge code of default=simple Felipe Contreras
2021-05-28 20:10 ` [PATCH 02/11] push: move code to setup_push_simple() Felipe Contreras
2021-05-28 20:10 ` [PATCH 03/11] push: reorganize setup_push_simple() Felipe Contreras
2021-05-28 20:52 ` Elijah Newren
2021-05-28 21:27 ` Felipe Contreras
2021-05-28 21:42 ` Elijah Newren
2021-05-28 20:10 ` [PATCH 04/11] push: simplify setup_push_simple() Felipe Contreras
2021-05-28 20:57 ` Elijah Newren
2021-05-28 21:28 ` Felipe Contreras
2021-05-28 20:10 ` [PATCH 05/11] push: remove unused code in setup_push_upstream() Felipe Contreras
2021-05-28 20:10 ` [PATCH 06/11] push: merge current and simple Felipe Contreras
2021-05-28 20:10 ` [PATCH 07/11] push: remove redundant check Felipe Contreras
2021-05-28 20:10 ` [PATCH 08/11] push: fix Yoda condition Felipe Contreras
2021-05-28 20:10 ` [PATCH 09/11] push: remove trivial function Felipe Contreras
2021-05-28 20:10 ` [PATCH 10/11] push: flip !triangular for centralized Felipe Contreras
2021-05-28 21:05 ` Elijah Newren
2021-05-28 21:57 ` Felipe Contreras
2021-05-28 20:10 ` [PATCH 11/11] doc: push: explain default=simple correctly Felipe Contreras
2021-05-28 21:07 ` Elijah Newren
2021-05-29 5:38 ` Bagas Sanjaya [this message]
2021-05-28 21:17 ` [PATCH 00/11] Unconvolutize push.default=simple Elijah Newren
2021-05-28 22:21 ` Felipe Contreras
2021-05-28 22:28 ` Elijah Newren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=540e249f-6bf9-0e4f-51db-20ce3ef8e5bf@gmail.com \
--to=bagasdotme@gmail.com \
--cc=avarab@gmail.com \
--cc=felipe.contreras@gmail.com \
--cc=git@matthieu-moy.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=l.s.r@web.de \
--cc=mathiaskunter@gmail.com \
--cc=newren@gmail.com \
--cc=peff@peff.net \
--cc=r@artagnon.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.