From patchwork Sun May 5 16:06:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denton Liu X-Patchwork-Id: 10930301 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 41F571395 for ; Sun, 5 May 2019 16:07:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3077B28627 for ; Sun, 5 May 2019 16:07:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 24F4A2863C; Sun, 5 May 2019 16:07:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CAFC728627 for ; Sun, 5 May 2019 16:07:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727789AbfEEQHF (ORCPT ); Sun, 5 May 2019 12:07:05 -0400 Received: from mail-io1-f66.google.com ([209.85.166.66]:33616 "EHLO mail-io1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726524AbfEEQHE (ORCPT ); Sun, 5 May 2019 12:07:04 -0400 Received: by mail-io1-f66.google.com with SMTP id z4so2462387iol.0 for ; Sun, 05 May 2019 09:07:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=E3hpcE86jhWw+YfjQjyjHNhsDPyY5cckhBJ0imZ+5oo=; b=E/j/++Q5O9KS7Zk5lDrrOX/erQJ6OyT/x5WipzDvAMYQ0DfZYLYSHD7gzq8eyO7m3Y Koz2wuTcZdh8jVldKH8N86B6qZYXsb+/vYa0lXXgQimsqn7CptxdzMtI1kFIjI4pDVrv KXu5d0/yS6tqEgYFuAswXddm+FRwaBszSLZj8IjmLpZ61TbSRLw2SAJO+y7o+HXnMVPy 0Ol924u23abrPtpcpuv2nyIgAjwmX6C4Wp6kcvRrlFzIMmRW+L3H2DIwsOx7f33Q+3oo hllVtQpw4iTq40mj/+DrvJnWk4LxnS42p05OzSWTYsO10XFD20kQcy9lLE69u7hMQ/zY jUTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=E3hpcE86jhWw+YfjQjyjHNhsDPyY5cckhBJ0imZ+5oo=; b=GrxJPthHCdkTYt7nrtaxEP901Rl+EZVqXnkQAwKfCK0vzgDVAPzwJ2ce/f0lnXZdjr JGTSSaKsBVcnwQ3E9Xq1E1jRSzJbLxsBs4bykuXgDmeR2FVLe1Djzn15aECZ71krhnHA mAITQwjxhtQ/5DL6hqU9UAXyYeELKnw9xC8OgKH7gwo4o/fUST/Ue1ZJxRWeWppWj7Af 4LtMyhNOebN8DTNTmziM+VI5xZsj9uWZfwEKxaFza5hcB4FwovleeFOq4GTX8X2WzZ5j KgHcbej0ziRUaAXs8rJ3eoYTsWGEGuf5gd1jS+N762WSEyeaSBwmtIv1/Z8R6gTVXDX0 Frtw== X-Gm-Message-State: APjAAAUdR58F0w7G0PBIUUtvGh8id4Jn4hc17UkcCbKjeZYeXvJ5puzx RNZ9S/I+Ps6lxehx2Ib+0RaShk2w X-Google-Smtp-Source: APXvYqw/IBmcqcmmai/LKQA2vlME15wBUPlge5yy23jiby6HUMDqu+91l3tXZIfh96uraW8IjsGLVw== X-Received: by 2002:a5e:9901:: with SMTP id t1mr6524454ioj.150.1557072423743; Sun, 05 May 2019 09:07:03 -0700 (PDT) Received: from archbookpro.localdomain ([199.119.233.193]) by smtp.gmail.com with ESMTPSA id a21sm2761857ioo.68.2019.05.05.09.07.02 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sun, 05 May 2019 09:07:03 -0700 (PDT) Date: Sun, 5 May 2019 12:06:59 -0400 From: Denton Liu To: Git Mailing List Cc: Andreas Heiduk , Duy Nguyen , Junio C Hamano Subject: [PATCH v3 1/4] revisions.txt: change "rev" to "" Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.11.4 (2019-03-13) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In revisions.txt, there were some instances of a rev argument being written as "rev". However, since they didn't mean the string literal, write "", instead. Signed-off-by: Denton Liu --- Documentation/revisions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt index 2337a995ec..e5f11691b1 100644 --- a/Documentation/revisions.txt +++ b/Documentation/revisions.txt @@ -159,12 +159,12 @@ thing no matter the case. '{caret}0' is a short-hand for '{caret}\{commit\}'. + -'rev{caret}\{object\}' can be used to make sure 'rev' names an -object that exists, without requiring 'rev' to be a tag, and -without dereferencing 'rev'; because a tag is already an object, +'{caret}\{object\}' can be used to make sure '' names an +object that exists, without requiring '' to be a tag, and +without dereferencing ''; because a tag is already an object, it does not have to be dereferenced even once to get to an object. + -'rev{caret}\{tag\}' can be used to ensure that 'rev' identifies an +'{caret}\{tag\}' can be used to ensure that '' identifies an existing tag object. '{caret}{}', e.g. 'v0.99.8{caret}{}':: From patchwork Sun May 5 16:07:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denton Liu X-Patchwork-Id: 10930303 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 66A21924 for ; Sun, 5 May 2019 16:07:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5434628627 for ; Sun, 5 May 2019 16:07:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 488DF2863C; Sun, 5 May 2019 16:07:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CC67A28627 for ; Sun, 5 May 2019 16:07:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727812AbfEEQHI (ORCPT ); Sun, 5 May 2019 12:07:08 -0400 Received: from mail-it1-f195.google.com ([209.85.166.195]:55162 "EHLO mail-it1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726524AbfEEQHI (ORCPT ); Sun, 5 May 2019 12:07:08 -0400 Received: by mail-it1-f195.google.com with SMTP id a190so16696483ite.4 for ; Sun, 05 May 2019 09:07:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=QSGrZXrIo5OuwYEzVKI/rvG/GRnj2MKVOwqwKsJyQUY=; b=eiEX76sU9EEqpRtHyG+a4e3r4od4KVEdxsJIRmtuI66XN1GjDIDJnb1Do0wet/Iel9 XwaFNL9Lvljf7idCFIJc+ukbAHbepRdqrzqN9dPJ8o/M5+/tZfotXdILKaQ/xTZCY1p7 XqgHhcUAfVmH9EMFY/G61MUU0iAmeGdINSvuLaXLB8kyEnWothQ5QzTDwlz1Rd03Yuv3 TcZBp8J2enGTpNCQtKL+TGZA6vthDkwAjQ0bORrkeb2mgUvYhHk5InRQl0ezFk8qMDCW bBTfykr7V22x4Wq+EETHgKlnoRVuwK4Kv4k9ssXcQJQKUTuY9F0qHq11B6wYTqq5bgWd c71g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=QSGrZXrIo5OuwYEzVKI/rvG/GRnj2MKVOwqwKsJyQUY=; b=ndWih0OSfv2cpr3K/l3zl6o0Zw1+gSfk6Jr9r3/ede9racKUfHAQwsWpvKOSFGVSRk OzUBbOnIVLQuVg5NVf6Vd2BBiyqfMsxpnRI32718e2lO8EvXu5Vfv5YbuWIgKFFwVN1X orK7NK7ECeo7pjCyQbGsTxjVnbdTavo9Hg8VPwHUiCZKYDprEqC7r4YQZImsg4lQIna4 omJ13qGvw678TmRYmjr072ZOnfIQH+rwN5kFe1b5NTk9HkkAxRIUb0dnCqXCFsq47tNL FOV5cZPY/3nK6BMSXTypht+zgWr04hAsDawsHbnbvZP4tCacspNCnbqG8sNM0SOtB5nj F+Og== X-Gm-Message-State: APjAAAX0CDxPOEtNmfdTM4DXJmTBlkqbcoK3qEt/BmtJs8YN/jQgKtkV bVBJRfZXC7dzCTqOsR+zcfMGpZMD X-Google-Smtp-Source: APXvYqzooIV8RzUb4RHsoROgzCipLGQKQJFIrCpKzmKgZCKPwpKhbCfhm+HtOdVrI82TyBGKziy4eQ== X-Received: by 2002:a24:68c3:: with SMTP id v186mr11604725itb.128.1557072427045; Sun, 05 May 2019 09:07:07 -0700 (PDT) Received: from archbookpro.localdomain ([199.119.233.193]) by smtp.gmail.com with ESMTPSA id n199sm3799585itn.34.2019.05.05.09.07.05 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sun, 05 May 2019 09:07:06 -0700 (PDT) Date: Sun, 5 May 2019 12:07:03 -0400 From: Denton Liu To: Git Mailing List Cc: Andreas Heiduk , Duy Nguyen , Junio C Hamano Subject: [PATCH v3 2/4] revisions.txt: mark optional rev arguments with [] Message-ID: <27379aaea940385a7569c1b8a4ff1aac3fc2c05f.1557072286.git.liu.denton@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.11.4 (2019-03-13) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In revisions.txt, an optional rev argument was not distinguised. Instead, a user had to continue and read the description in order to learn that the argument was optional. Since the [] notation for an optional argument is common-knowledge in the Git documentation, mark optional arguments with [] so that it's more obvious for the reader. Helped-by: Andreas Heiduk Signed-off-by: Denton Liu --- Documentation/revisions.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt index e5f11691b1..dd99770c47 100644 --- a/Documentation/revisions.txt +++ b/Documentation/revisions.txt @@ -65,7 +65,7 @@ some output processing may assume ref names in UTF-8. '@':: '@' alone is a shortcut for `HEAD`. -'@{}', e.g. 'master@\{yesterday\}', 'HEAD@{5 minutes ago}':: +'[]@{}', e.g. 'master@\{yesterday\}', 'HEAD@{5 minutes ago}':: A ref followed by the suffix '@' with a date specification enclosed in a brace pair (e.g. '\{yesterday\}', '{1 month 2 weeks 3 days 1 hour 1 @@ -95,7 +95,7 @@ some output processing may assume ref names in UTF-8. The construct '@{-}' means the th branch/commit checked out before the current one. -'@\{upstream\}', e.g. 'master@\{upstream\}', '@\{u\}':: +'[]@\{upstream\}', e.g. 'master@\{upstream\}', '@\{u\}':: The suffix '@\{upstream\}' to a branchname (short form '@\{u\}') refers to the branch that the branch specified by branchname is set to build on top of (configured with `branch..remote` and @@ -103,7 +103,7 @@ some output processing may assume ref names in UTF-8. current one. These suffixes are also accepted when spelled in uppercase, and they mean the same thing no matter the case. -'@\{push\}', e.g. 'master@\{push\}', '@\{push\}':: +'[]@\{push\}', e.g. 'master@\{push\}', '@\{push\}':: The suffix '@\{push}' reports the branch "where we would push to" if `git push` were run while `branchname` was checked out (or the current `HEAD` if no branchname is specified). Since our push destination is @@ -131,7 +131,7 @@ from one location and push to another. In a non-triangular workflow, This suffix is also accepted when spelled in uppercase, and means the same thing no matter the case. -'{caret}', e.g. 'HEAD{caret}, v1.5.1{caret}0':: +'{caret}[]', e.g. 'HEAD{caret}, v1.5.1{caret}0':: A suffix '{caret}' to a revision parameter means the first parent of that commit object. '{caret}' means the th parent (i.e. '{caret}' @@ -302,7 +302,7 @@ The 'r1{caret}@' notation means all parents of 'r1'. The 'r1{caret}!' notation includes commit 'r1' but excludes all of its parents. By itself, this notation denotes the single commit 'r1'. -The '{caret}-' notation includes '' but excludes the th +The '{caret}-[]' notation includes '' but excludes the th parent (i.e. a shorthand for '{caret}..'), with '' = 1 if not given. This is typically useful for merge commits where you can just pass '{caret}-' to get all the commits in the branch From patchwork Sun May 5 16:07:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denton Liu X-Patchwork-Id: 10930305 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BBE8E924 for ; Sun, 5 May 2019 16:07:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A93A928627 for ; Sun, 5 May 2019 16:07:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9BC292863C; Sun, 5 May 2019 16:07:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 502C528627 for ; Sun, 5 May 2019 16:07:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727816AbfEEQHL (ORCPT ); Sun, 5 May 2019 12:07:11 -0400 Received: from mail-it1-f193.google.com ([209.85.166.193]:52438 "EHLO mail-it1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726524AbfEEQHL (ORCPT ); Sun, 5 May 2019 12:07:11 -0400 Received: by mail-it1-f193.google.com with SMTP id q65so15236476itg.2 for ; Sun, 05 May 2019 09:07:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=VIeUW11pneVJsGTLIaQBeJtHbaw4Oght/gEo1s2JLdw=; b=O+wLglmAyGKOuC9ApEP3usBBcuLx5B2siB0UyciJKbCSKRnoyhA3Rov+vHcQ+qG4Yz 4TPkcK9H60ko1cN3popOeIbUaHmgs4zFJUSEIE6Ys4eP5JlNMeZqgcn0pjqZv/fdVDw8 ceVpGEVxLJOaDrRZtzjqzIVopYBb8/c7oPFTqvzU3BEPC+iy+WpAoaVoDSInBYxnehAy bVdhkr95sfNk84dK0ypAjbs2gbrfwIhJOHdt42lH4+pqG7YmTxkGR2ZgvelyaVhvlyZ5 FqIvIUJK04Q1iDrcAWe4SXJA2X2qON/JasPFolqQST86lADp4rHnaKnm4c4s+MC6GTAm WZTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=VIeUW11pneVJsGTLIaQBeJtHbaw4Oght/gEo1s2JLdw=; b=k4Q7IqF06cZKuVw/i1lK0s0JtQJoP+OidLgS/gJj7IAWRFnul37IQuwKi9yChEyGII wSsyrGDYh5n+ml7R8ENfpChi37MbC+m79Xd5G0fvPgIRYwlxZc3JzqqGGBBeGgPU0jZs XGUNmmOPvAn5x91I6fho5eREtAsw0wMIjc2XQf0W5SNniUHaEiY/Tqmmuo/wJIoTRPeq Ban9JRNnPCsgE6+X39RmPBqCSUfZt/b93sbwVXcyk/8PGFZh9OObsl3qB/valr4filZm M2Fy2kqFlneMfJ+XR8iMr6LOvAOI+hBsliM7mUBjp824S65reCWn/ZxJTM4xTwxRQL7e p+wg== X-Gm-Message-State: APjAAAUQE/8C0BoTJ7hJu54KpEkZ3P/YH7WwNKu4Sr8PlV3J+vABC10K kJMz1krXSzDTGP4rjtBlgcDHfEmE X-Google-Smtp-Source: APXvYqzF5G/xYaZxCvVaUxs4kwj/3rDWSmqiDaKBemh3oz1WswKQ3sJCl5Mv8Y9qoOhruljF1VOxkQ== X-Received: by 2002:a24:4145:: with SMTP id x66mr15752281ita.130.1557072430396; Sun, 05 May 2019 09:07:10 -0700 (PDT) Received: from archbookpro.localdomain ([199.119.233.193]) by smtp.gmail.com with ESMTPSA id j8sm3497143itk.0.2019.05.05.09.07.08 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sun, 05 May 2019 09:07:09 -0700 (PDT) Date: Sun, 5 May 2019 12:07:07 -0400 From: Denton Liu To: Git Mailing List Cc: Andreas Heiduk , Duy Nguyen , Junio C Hamano Subject: [PATCH v3 3/4] revisions.txt: mention ~ form Message-ID: <1ba823024edddfb0e6ccb92647137eccf5d4c7d0.1557072286.git.liu.denton@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.11.4 (2019-03-13) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In revisions.txt, the '^' form is mentioned but the '~' form is missing. Although both forms are essentially equivalent (they each get the first parent of the specified revision), we should mention the latter for completeness. Make this change. Signed-off-by: Denton Liu --- Documentation/revisions.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt index dd99770c47..a38ec7fb52 100644 --- a/Documentation/revisions.txt +++ b/Documentation/revisions.txt @@ -139,7 +139,9 @@ thing no matter the case. '{caret}0' means the commit itself and is used when '' is the object name of a tag object that refers to a commit object. -'{tilde}', e.g. 'master{tilde}3':: +'{tilde}[]', e.g. 'HEAD{tilde}, master{tilde}3':: + A suffix '{tilde}' to a revision parameter means the first parent of + that commit object. A suffix '{tilde}' to a revision parameter means the commit object that is the th generation ancestor of the named commit object, following only the first parents. I.e. '{tilde}3' is From patchwork Sun May 5 16:07:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denton Liu X-Patchwork-Id: 10930307 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id ED7241395 for ; Sun, 5 May 2019 16:07:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DACEB28627 for ; Sun, 5 May 2019 16:07:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CF4EA2863C; Sun, 5 May 2019 16:07:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7633528627 for ; Sun, 5 May 2019 16:07:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727825AbfEEQHP (ORCPT ); Sun, 5 May 2019 12:07:15 -0400 Received: from mail-io1-f67.google.com ([209.85.166.67]:42318 "EHLO mail-io1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726524AbfEEQHP (ORCPT ); Sun, 5 May 2019 12:07:15 -0400 Received: by mail-io1-f67.google.com with SMTP id c24so9086138iom.9 for ; Sun, 05 May 2019 09:07:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=SUCPUcvvbwIBA9rsZlrPzdV2UdlpMC2ciT7FyxtpIug=; b=NTjIo2QS5WCnrKjm/C9ZuBXGaZe2e37a4jHRkqg9ezDqTeHF7CbY7H4i3vKRthQiAr uTSMjAa1OIaqMFidwMWRQYw8iRwem9vysGWuRCRJ2ZhFDQqCxHKqvxfro0tyOgR/9Bs+ n1pdjhQA6yiHwNv0nzWYfx3ZEkI128DBC/EiGtnYncbj2rw+ujf4AsjsH3Qa2x5Erijk Z3iW2BOsr4nM2K75Omyax5hNtZSwadC1AxQBcJyeZqYNnNN/zWmhggjR0yTjwXvP8UXG GaEwno0C8ySDDaaX+KPpQ/XoaU3ctfIaoX+MxagbcTR5IfpMLG4Jqko/KjvyEe1WacqY nfpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=SUCPUcvvbwIBA9rsZlrPzdV2UdlpMC2ciT7FyxtpIug=; b=SDe8nc+ujSUg1IQqzk9LuFyeXVvlGwFfsL0zuzpjS3PQ1DVJugs/MfqrscU+1Wt6PA ddRdW+LCqlb8FfOP4RGdMJy8R/dN2PDLXUdclczI7apBG3Vgeo6XI4w02rouY/2GpI9I ZdjowU5VYSaxpDGBXUCS2qlGR/WZqjJ6QDVLxH1ZjAWhhor2gj/7tnQ8G/Ci7JUmjb/i /aVfUX3B9wrCe4W+R9jR7ND6pM14C+rXXWb/wqtvGOcF33CTCCTnEuHt9qfJn42tpSXM xkL6fglDPQlf1G58Xjdzh3MyNuChxUt4Z3jKD/qOQ7XnXDbuXXp5mIq/cFLKbcjlqMgq asmA== X-Gm-Message-State: APjAAAUJOLq0FP0B4D2b3eGR12vrwLR8Hw8yNPOX1iGGpfjOvVHX+TFQ S5cZOIKZO2lavDwPEUT9Mvloyp5v X-Google-Smtp-Source: APXvYqwwp4tsDOl9x/NgQ/yFe61gB0+pxHugbRnIOmzgdj5mqIBL6FnH4Uqu4ekFtJMBPauE5iaeOw== X-Received: by 2002:a5e:8b06:: with SMTP id g6mr12778648iok.27.1557072434384; Sun, 05 May 2019 09:07:14 -0700 (PDT) Received: from archbookpro.localdomain ([199.119.233.193]) by smtp.gmail.com with ESMTPSA id v1sm1575683iob.56.2019.05.05.09.07.13 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sun, 05 May 2019 09:07:13 -0700 (PDT) Date: Sun, 5 May 2019 12:07:10 -0400 From: Denton Liu To: Git Mailing List Cc: Andreas Heiduk , Duy Nguyen , Junio C Hamano Subject: [PATCH v3 4/4] revisions.txt: remove ambibuity between : and : Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.11.4 (2019-03-13) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Andreas Heiduk The revision ':README' is mentioned as an example for ':' but the explanation forwards to the '::' syntax. At the same time '::' did not mark the ':' as optional. Signed-off-by: Andreas Heiduk Signed-off-by: Denton Liu --- Just for clarification, the correct procedure is to include my sign-off on top of Andreas' when I'm forwarding patches, correct? If it's not, Junio, please take my sign-off for me. Documentation/revisions.txt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt index a38ec7fb52..82c1e5754e 100644 --- a/Documentation/revisions.txt +++ b/Documentation/revisions.txt @@ -196,19 +196,16 @@ existing tag object. Depending on the given text, the shell's word splitting rules might require additional quoting. -':', e.g. 'HEAD:README', ':README', 'master:./README':: +':', e.g. 'HEAD:README', 'master:./README':: A suffix ':' followed by a path names the blob or tree at the given path in the tree-ish object named by the part before the colon. - ':path' (with an empty part before the colon) - is a special case of the syntax described next: content - recorded in the index at the given path. A path starting with './' or '../' is relative to the current working directory. The given path will be converted to be relative to the working tree's root directory. This is most useful to address a blob or tree from a commit or tree that has the same tree structure as the working tree. -'::', e.g. ':0:README', ':README':: +':[:]', e.g. ':0:README', ':README':: A colon, optionally followed by a stage number (0 to 3) and a colon, followed by a path, names a blob object in the index at the given path. A missing stage number (and the colon