From: Bagas Sanjaya Date: Sat, 29 May 2021 05:38:41 GMT Subject: Re: [PATCH 11/11] doc: push: explain default=simple correctly Message-ID: <540e249f-6bf9-0e4f-51db-20ce3ef8e5bf@gmail.com> 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 -- An old man doll... just what I always wanted! - Clara