Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp1241655ybi; Fri, 31 May 2019 16:38:35 -0700 (PDT) X-Google-Smtp-Source: APXvYqxAcnmhYGcpw3xOFS41WS2KaR757oWYalHXxCE7AkzKvydP3FBhOCXqDzv9pvH7Vn+cURGZ X-Received: by 2002:a63:5b5d:: with SMTP id l29mr12426759pgm.444.1559345915467; Fri, 31 May 2019 16:38:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559345915; cv=none; d=google.com; s=arc-20160816; b=uAtRh2ittE4r3/iTfc+zeecSpXeHp68vjRsjENYRVxS2EJ3ToiZAPbtnPbaFbmd4uN yzuQACHi9zwGQrbH2wwg7DMVMNQ4NP6F82tHGrOYxgXBs3iJEqiTlGaWmeUn91abDZYI Lmoa15BUH11jaGUEAeAVaVhi3/fmli2C6VzSU96nCRKSTICWuLbGuof68EzZVimpsnp7 cWOxpfIVpyfdyRxEv7pFcDdcscTUA8yIFnh18znGzpao8IPF+sTJcC9RnXOdgUbmK1V1 gRMGw3Vtx4QHRkfA2UjE/nJ+jAHGuQq/2AClbsaq24FmqKhteQ4906Z3f7cXWRq/2ofH 5cLA== 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:mime-version :organization:references:in-reply-to:message-id:subject:cc:to:from :date; bh=stNv+nb7rxPpo17ChpSKUN5zW/t/O616zw4zYdtZ9/s=; b=crvwzb9bGYYsx5ODOyrwZYplSVDZKx2dxgIZKfORkv5drVq528ix5DMKBwUUyXuzEm W6iF+akG46S5E8MNk1qzcIg0c25m8qS4f03Uas/0thWPhAXiaTaijybd91DNhwBnGKA3 qT8Kg7FCvUUzdFSY3BRUORxMV6cCCvLQlXF7smZpDJokVY6NB1CJusik4eklzEAvwelY yuhyxxMiwFV9YjFQ4Zss3a2q1kcQyCMOpruHigD7R5fQrBAqWsSenZ0abfmYhCaR4WHv sD3lI/6AOL0Fd20aDiH1PcveSG0F07MuCZ6BOFJwvtjM2s0GewPc/9zVZTfA5WO/sZmZ Rh7g== ARC-Authentication-Results: i=1; mx.google.com; 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 e6si7348097pjr.91.2019.05.31.16.38.20; Fri, 31 May 2019 16:38:35 -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; 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 S1726799AbfEaXgV (ORCPT + 99 others); Fri, 31 May 2019 19:36:21 -0400 Received: from ms.lwn.net ([45.79.88.28]:37358 "EHLO ms.lwn.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726518AbfEaXgU (ORCPT ); Fri, 31 May 2019 19:36:20 -0400 Received: from lwn.net (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ms.lwn.net (Postfix) with ESMTPSA id D10EA728; Fri, 31 May 2019 23:36:19 +0000 (UTC) Date: Fri, 31 May 2019 17:36:18 -0600 From: Jonathan Corbet To: Randy Dunlap Cc: Linus Torvalds , LKML , linux-doc@vger.kernel.org Subject: Re: [PATCH RFC] Rough draft document on merging and rebasing Message-ID: <20190531173618.465ae659@lwn.net> In-Reply-To: <7979b995-6b03-783b-e3d7-0023fabc43bc@infradead.org> References: <20190530135317.3c8d0d7b@lwn.net> <7979b995-6b03-783b-e3d7-0023fabc43bc@infradead.org> Organization: LWN.net MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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? Thanks, jon