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.9 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 3FDB51F5B1 for ; Wed, 29 Jul 2020 20:57:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727016AbgG2U5Q (ORCPT ); Wed, 29 Jul 2020 16:57:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35024 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726496AbgG2U5P (ORCPT ); Wed, 29 Jul 2020 16:57:15 -0400 Received: from mail-lj1-x243.google.com (mail-lj1-x243.google.com [IPv6:2a00:1450:4864:20::243]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2A9B8C061794 for ; Wed, 29 Jul 2020 13:57:15 -0700 (PDT) Received: by mail-lj1-x243.google.com with SMTP id t23so3034393ljc.3 for ; Wed, 29 Jul 2020 13:57:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-foundation.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=ktAIduaS1qT3qTb0HaonV5pwoBc4SiIeq3oS3+ccmOY=; b=T0NMdSus+R19BT2CR9u1QwkG1jI2tBqvcQY5kceVz/XG27v1D80cfKjx7LH4kaprjQ GNdfrFZYgm/aRhZiF/stSbacuCLDNLaG2rzTF37pHeTyvyoOCRwHJwC1F6LSL2+Pe5Bf QudvbzA/1OkRqJsnnBU9oy8yBWvrv27BSP7b4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=ktAIduaS1qT3qTb0HaonV5pwoBc4SiIeq3oS3+ccmOY=; b=YMxJflLTnA2ZyzT3J6SbsDxFOIYf2lJxPaKs+j65uNuo2OfNz8e6AcyBYKp8Ewtrz6 ftw5fRsuQYay5xgD4gtVWIwGWMRXDnFbDPD0QjDMsjrsnraJfTtRyVsiylttBjqUmKUr VlS/R2FQ1BylTJp2H89MpYY/I0o0nU6zYCGPioaxR2306chhyVLAPiBo7uxDK3BtBqDI nM6LPquygPqcYwC1AANE2kosh/kpa0DD5DzyWHvOn3FOMHpjTQROazp9TgNJlFcA4m6Z LuvwT1xW5vnQY0Rw4AlptbIsqu/DgdcNHTgkfCTH4I/swgbr4hPicpz0yTo9x3Y1C+Th RWiw== X-Gm-Message-State: AOAM531G7XnoTTP/WUzDKBjHICNJ4BV1a8UNS7PAZq8o7bX07b8ABNmc IvVcCVQCkChNY2J2MjdiP+E6KKmBWW0= X-Google-Smtp-Source: ABdhPJyxlVzIvu7NwXS10tWZzM5z54f2Ryf2bxJVyRzfwePuDMiz4s9/RRiav89sHEvPriXtSWn+IQ== X-Received: by 2002:a2e:961a:: with SMTP id v26mr74644ljh.467.1596056233401; Wed, 29 Jul 2020 13:57:13 -0700 (PDT) Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com. [209.85.167.41]) by smtp.gmail.com with ESMTPSA id s2sm702264lfs.4.2020.07.29.13.57.12 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 29 Jul 2020 13:57:13 -0700 (PDT) Received: by mail-lf1-f41.google.com with SMTP id i19so13781265lfj.8 for ; Wed, 29 Jul 2020 13:57:12 -0700 (PDT) X-Received: by 2002:ac2:58d5:: with SMTP id u21mr26784lfo.31.1596056231391; Wed, 29 Jul 2020 13:57:11 -0700 (PDT) MIME-Version: 1.0 References: <20200729203856.GA519065@google.com> In-Reply-To: From: Linus Torvalds Date: Wed, 29 Jul 2020 13:56:55 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: Avoiding 'master' nomenclature To: Jonathan Nieder Cc: Junio C Hamano , Johannes Schindelin , Git List Mailing Content-Type: text/plain; charset="UTF-8" Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Wed, Jul 29, 2020 at 1:46 PM Linus Torvalds wrote: > > But I was annoyed by this because it took me much too long to notice > that my merge messages are now unnecessarily ugly for the last two > days, for a _very_ bad reason. sed s/days/weeks/ I guess that shows how much I look at the boiler-plate. I try to make my merge messages readable and spend actual effort on formatting etc, but take all the git-provided stuff for granted. This violated that trust. Linus