From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-3.5 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_PASS, SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 77D5E1F5AE for ; Tue, 16 Jun 2020 08:59:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726496AbgFPI7k (ORCPT ); Tue, 16 Jun 2020 04:59:40 -0400 Received: from mx2.suse.de ([195.135.220.15]:42414 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725896AbgFPI7j (ORCPT ); Tue, 16 Jun 2020 04:59:39 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 4EF36AB76; Tue, 16 Jun 2020 08:59:42 +0000 (UTC) Date: Tue, 16 Jun 2020 10:59:36 +0200 From: Michal =?iso-8859-1?Q?Such=E1nek?= To: demerphq Cc: =?iso-8859-1?Q?S=E9rgio?= Augusto Vianna , konstantin@linuxfoundation.org, Johannes Schindelin , don@goodman-wilson.com, Git , newren@gmail.com, philipoakley@iee.email, "brian m. carlson" , Simon Pieters , Derrick Stolee Subject: Re: Rename offensive terminology (master) Message-ID: <20200616085936.GC21462@kitsune.suse.cz> References: <20200614181906.u42tuny3eipvhd46@chatter.i7.local> <20200616074316.GA21462@kitsune.suse.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Tue, Jun 16, 2020 at 10:01:54AM +0200, demerphq wrote: > On Tue, 16 Jun 2020 at 09:43, Michal Suchánek wrote: > > > > On Tue, Jun 16, 2020 at 09:36:59AM +0200, demerphq wrote: > > > On Sun, 14 Jun 2020 at 20:24, Sérgio Augusto Vianna > > > wrote: > > > > > > > > Ok, can you show me a single instance where "master" was confusing or > > > > not descriptive enough? > > > > > > A: "No you need to fetch master from the remote, then you need to > > > merge it to your local master and then push it to the master master". > > > B: "remote master, local master and master master. wtf kind of master is that?" > > Which falls on the wording of the FAQ, not the terminology itself. If > > you were confused I am sure there are ways to bring this up and even > > submit changes. > > I think you missed my point entirely. Sergio asked how "master" might No you did. What I am trying to say is you did not your job well when the FAQ for git or your project has the answer "...and then push it to the master master". Thanks Michal