Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp1254016ybi; Fri, 31 May 2019 16:53:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqyjD6R7NtxGOsYf3BcFykJ/jP0icwVrL0vCSP1sG2A6cXHokqpsk4V6sdS4LUz2gRwgJzeG X-Received: by 2002:a17:90a:2908:: with SMTP id g8mr12721578pjd.131.1559346817672; Fri, 31 May 2019 16:53:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559346817; cv=none; d=google.com; s=arc-20160816; b=GHrVJPqd87snI2DZVV20lAMvm/0BjJ5ZO7IkFP+IJAzOIhA3tA9mfnnwQRR4yaWSOD IpAIJ9X9Zb9BqImHbwG2vJvtfnz3y8+2Ts1sH5erkk6fEYNHyvYUDbjn1K98I5yc1WXw FNm6vozx2F9U2sDNTdYucjJ/Zi2c0dTNhPXiqBq2qfZEGk3SVi0Z6pYWojUIkAJXuxNl BT87g6r9GA7HRNxhp6ddiIq5guELdXzg9tLAPFLPhtUPuoH8F5lcp7VaB21ybcKbk5Yy kiQ802zham3kZYzGotA3WDDqhTr2z6rlOs+0Q0/ATVZVBG4mQFG9KV87rMovBRvFTouz FSsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject:dkim-signature; bh=3wGlX09ThV78ZhwRXZYCSXCtvWFVlgTZB4/+Smzd1UY=; b=XPSiVFcwS7kCyx/RtbBwSv98YYS2pHzLCdYYkqP053rJbCuR1Dpp38qnzIWMYppLgR B3jxFUM0zwNYTREw00H6Hr5IeLmE4VQvIwiWSmb1/enVMjrMehDoRq+BCPkbXscHJ9bi X03W4IQVcjdXesGggE7ERj02SzDpAIX5D+zqt/JNEFal9rvOBMUn12pkfL+eacHJjHx/ LJJnovcqLxYSA6y+S6lI64oOEaGrt2xLldx3/hNKlPDc7x0ywTzOx06TQkYyVM1UNohB t6Sj9f/3Cgc+ijZsx8f++ERpaOscptOuJM46mZYw74DhuLBqSx7iILvOcoi7WZYX+0wR KodQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=nFZDBs8V; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k32si7849999pgm.416.2019.05.31.16.53.20; Fri, 31 May 2019 16:53:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=nFZDBs8V; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726842AbfEaXwI (ORCPT + 99 others); Fri, 31 May 2019 19:52:08 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:38708 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726643AbfEaXwH (ORCPT ); Fri, 31 May 2019 19:52:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: Content-Type:In-Reply-To:MIME-Version:Date:Message-ID:From:References:Cc:To: Subject:Sender:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=3wGlX09ThV78ZhwRXZYCSXCtvWFVlgTZB4/+Smzd1UY=; b=nFZDBs8VSLFtmN7+y341PHMEW 7eyIuFiANsukXA+F0eH7xtfVBPBEZdimy2HJtX5nsqjIoqUsj+VrJX2s4yYvsAeQsCFMNDPoPGIaE k58RHPCRyiEl2OPMHhawhT9ZAP9MZUFphQ4iUGgPXViGtIu+gtMp96geL+2DCaDr73aYOmtZv5wIq fqKbMz/o/iuu840hoRRcmJX79DfUrd2KeoHGC4lAwvQEV+iGraVjSH2bzkr578rU+ZBN7ikYOQk2u 40vvKNWgmAeHvW7LJmOay4jwwQFIGqCyCdDjS4DH76Ynzt6XXeGAKwPMtqqk1beqK5KV3NDCLChC1 vLguXCTlw==; Received: from static-50-53-52-16.bvtn.or.frontiernet.net ([50.53.52.16] helo=midway.dunlab) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1hWrJf-0006CE-6Y; Fri, 31 May 2019 23:52:07 +0000 Subject: Re: [PATCH RFC] Rough draft document on merging and rebasing To: Jonathan Corbet Cc: Linus Torvalds , LKML , linux-doc@vger.kernel.org References: <20190530135317.3c8d0d7b@lwn.net> <7979b995-6b03-783b-e3d7-0023fabc43bc@infradead.org> <20190531173618.465ae659@lwn.net> From: Randy Dunlap Message-ID: <90525060-9c28-6110-9bdd-b0a4a850ab05@infradead.org> Date: Fri, 31 May 2019 16:52:06 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <20190531173618.465ae659@lwn.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 5/31/19 4:36 PM, Jonathan Corbet wrote: > On Thu, 30 May 2019 17:45:23 -0700 > Randy Dunlap wrote: > >> On 5/30/19 12:53 PM, Jonathan Corbet wrote: >>> + git merge v5.2-rc1^0 >> >> That line is presented in my email client (Thunderbird) as >> >> git merge v5.2-rc1{superscript 0} >> >> Could you escape/quote it to prevent that? > > So I'm a wee bit confused. That's a literal string that one needs to > type to obtain the needed effect; if thunderbird is doing weird things > with it, I think that the problem does not lie with the document...? What > change would you have me make here? I dunno. I just won't depend on my email client. I'll read it some other way (like a text editor). cheers. -- ~Randy