From patchwork Fri Jul 3 03:38:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin via GitGitGadget X-Patchwork-Id: 11640747 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 70D8B618 for ; Fri, 3 Jul 2020 03:38:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5812D20B1F for ; Fri, 3 Jul 2020 03:38:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fOOg3SH/" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726081AbgGCDie (ORCPT ); Thu, 2 Jul 2020 23:38:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56270 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726033AbgGCDic (ORCPT ); Thu, 2 Jul 2020 23:38:32 -0400 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5FD7CC08C5C1 for ; Thu, 2 Jul 2020 20:38:32 -0700 (PDT) Received: by mail-wr1-x443.google.com with SMTP id f2so3017466wrp.7 for ; Thu, 02 Jul 2020 20:38:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=WvLw9uA1lTQvWT517JXIxTV9H4oD+GrzaV2NfCJwdQ8=; b=fOOg3SH/tJkb9c59EtvhNXmV+sESvIrOhHaTWUol0id/nK3tb5lg/UYclgrsykwWSK bvNIQP0xALQoe4y22Ea4MskdTrIyBiO0P1mzCTcNjSGGpUOwKoGt7Q6301TwDQkc8/3a 18QSrycosPny24IEeGdSZPD+tS6hr5M28hzEdjQO3Wv4E9LMyVkvBKcQS2295NtcnnA8 CgaYZQhDQhpCp40+O51cVnpIsVTDF6UqARosJpwk9bJamF2UDB0Y0jEYTJD+wBf1m3ET ERy47enPo6P2TNOWWhNDul2H2GD1kocfUNuSOQt63dGRZwaL7mGiHL/X3Rwa1ZVU9pCn E2ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=WvLw9uA1lTQvWT517JXIxTV9H4oD+GrzaV2NfCJwdQ8=; b=Y8FNCDBpvi9wCb9HQkhkljQ7Y4f4pH0R5qtGF5VVi3K6kbBUfvyPAMnsqcR3fTA3iy AKGFcK8k25L/JXglYtpp62DfYgkUdc/x3zHD9IY99bqnHPRUGGJVs+YJvFQVcjKcQDUj oilRCq63Cbau3/Oo5/EbXX5RHloyk7TrA6i64mmzkwNnMqMkb0CYS/XN4GFwhPRUj9wg NCxL2szzBcncHWNLKrXIjnrkOBpvD4Bspo4vvxbpNeQX/DrJpU6sXr3uSwcVOG6p9ZkE CAZud1kn4/w1/aXvvnDetvrJoxRnMLJ1SDc9Er9BjgQgkUAtZ91nIj3bUF2dhHkKmdju FJuQ== X-Gm-Message-State: AOAM531bx3hOtmCczX3ksFC81QHZA7p09cPsuPa3cwS2kMQ82ppYG0y1 9tDqVqyfrvZjG0uvIipUrgJObv9A X-Google-Smtp-Source: ABdhPJyzXjMoLVYl2eFD5B05cQbxwJlBvl06MQB071ZAIA/RaC8C8RTZxVjTLj6V4ENoSl/PhRTqZA== X-Received: by 2002:adf:ed47:: with SMTP id u7mr37190891wro.201.1593747511028; Thu, 02 Jul 2020 20:38:31 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id o9sm12723767wrs.1.2020.07.02.20.38.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jul 2020 20:38:30 -0700 (PDT) Message-Id: <59c48282a094e90b7f4635c4cbcc04b1914b4c0e.1593747509.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Philippe Blain via GitGitGadget" Date: Fri, 03 Jul 2020 03:38:26 +0000 Subject: [PATCH v2 1/4] git-log.txt: add links to 'rev-list' and 'diff' docs Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Lawrence Siebert , Denton Liu , Junio C Hamano , Taylor Blau , Philippe Blain , Philippe Blain Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain Add links to the documentation for `git rev-list` and `git diff` instead of simply mentioning them, to make it easier for readers to reach these documentation pages. Let's link to `git diff` as this is the porcelain command, and the rest of the family (`diff-index`, `diff-tree` and `diff-files`) are mentioned in the "Raw output format" section of the `git diff` documentation. Signed-off-by: Philippe Blain --- Documentation/git-log.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index 20e6d21a74..04ea18d1c0 100644 --- a/Documentation/git-log.txt +++ b/Documentation/git-log.txt @@ -15,9 +15,9 @@ DESCRIPTION ----------- Shows the commit logs. -The command takes options applicable to the `git rev-list` +The command takes options applicable to the linkgit:git-rev-list[1] command to control what is shown and how, and options applicable to -the `git diff-*` commands to control how the changes +the linkgit:git-diff[1] family of commands to control how the changes each commit introduces are shown. From patchwork Fri Jul 3 03:38:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin via GitGitGadget X-Patchwork-Id: 11640751 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8A81D618 for ; Fri, 3 Jul 2020 03:38:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6A10520890 for ; Fri, 3 Jul 2020 03:38:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Foh9hAKt" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726117AbgGCDig (ORCPT ); Thu, 2 Jul 2020 23:38:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56274 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726053AbgGCDid (ORCPT ); Thu, 2 Jul 2020 23:38:33 -0400 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2CF0FC08C5DD for ; Thu, 2 Jul 2020 20:38:33 -0700 (PDT) Received: by mail-wr1-x42a.google.com with SMTP id s10so30948930wrw.12 for ; Thu, 02 Jul 2020 20:38:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=TKSgVEhpetKaGG40J72/nMhRAAlk00EhYwCqPLl45/s=; b=Foh9hAKtZgXXBiuT4suoXGXd+0CU2YqQL1OHlxN9+soAs7gIedJKNGKGxcy3mj/k/4 GyX/34WMbd5DJu7E3J7qX7suXNSkfnL3xB5At1wjztaw0I5okUIsYc8gZQQAC7zfMRWv 6Zgoj+Hw8DeKQ0lUPngzEez7gnrmy4O6b3CS09F7CDz1GUcRvQGJq/7Ss7jAyFogli0w nDRphOcl5ii7PoIbCWW4vuGSX18VhHUhcbTPIrQ4Lpfd70oZo8t5IzBUwJJj0cs7VyY8 mjKa4InOl8YqZiCrIp1Jd035Jf+ON4MKPFYkkawFKbim06q+5WL2wa4DQAuu3D2cyu4B S95g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=TKSgVEhpetKaGG40J72/nMhRAAlk00EhYwCqPLl45/s=; b=AgkKf4EZN5sHZqlLYHvs/iMPMN9UVDyLe3ICMVDQRxIAcd2+r+1JQM4eakwQLeVTMC NIBakZKrXYLjrZohsgK7AsmFP2+KPi0KZNR4tKWL8OQdy+af2ZBRmgZswz+c8SH/dyeT ZnQn/8h65DvymJs4scLCxRBaR2hqSVcie7LBoN6ShQ+UvdA+vPsLez+vl7YUmpaZY3A8 jiozsKXdtX3R7u1OyewCWTMgLovGfNaMFRmNuyuhA0P49xUKhg1q1Ln/ORvpQDKemcav wwcKePvfpoMPB+rBCEGKMz1mkCAGd8FAgCLIg05bPmGhI5KtjMK57o0Vm9LxCFy/WJ5b Lt0A== X-Gm-Message-State: AOAM530QOlq571IDJwBIkjJgQ0xp8/QBQ4DUYKXE8pP3LlNB3Jy/VgKZ grAPE58pYMUkC+m19iU9JbBET5hX X-Google-Smtp-Source: ABdhPJzeIxESWHNY04ffG0WOzIM5V3Um2k1FLGzw8boN2bwttSILAawUyDPH9291LsVvJulY8iqoYA== X-Received: by 2002:a5d:4202:: with SMTP id n2mr33562615wrq.171.1593747511751; Thu, 02 Jul 2020 20:38:31 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id v6sm191330wrr.85.2020.07.02.20.38.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jul 2020 20:38:31 -0700 (PDT) Message-Id: In-Reply-To: References: From: "Philippe Blain via GitGitGadget" Date: Fri, 03 Jul 2020 03:38:27 +0000 Subject: [PATCH v2 2/4] git-rev-list.txt: move description to separate file Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Lawrence Siebert , Denton Liu , Junio C Hamano , Taylor Blau , Philippe Blain , Philippe Blain Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain A following commit will reuse the description of the `git rev-list` command in the `git log` manpage. Move this description to a separate file. Signed-off-by: Philippe Blain --- Documentation/git-rev-list.txt | 39 +------------------------- Documentation/rev-list-description.txt | 38 +++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 38 deletions(-) create mode 100644 Documentation/rev-list-description.txt diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt index 025c911436..b06e11ae56 100644 --- a/Documentation/git-rev-list.txt +++ b/Documentation/git-rev-list.txt @@ -14,44 +14,7 @@ SYNOPSIS DESCRIPTION ----------- -List commits that are reachable by following the `parent` links from the -given commit(s), but exclude commits that are reachable from the one(s) -given with a '{caret}' in front of them. The output is given in reverse -chronological order by default. - -You can think of this as a set operation. Commits given on the command -line form a set of commits that are reachable from any of them, and then -commits reachable from any of the ones given with '{caret}' in front are -subtracted from that set. The remaining commits are what comes out in the -command's output. Various other options and paths parameters can be used -to further limit the result. - -Thus, the following command: - ------------------------------------------------------------------------ - $ git rev-list foo bar ^baz ------------------------------------------------------------------------ - -means "list all the commits which are reachable from 'foo' or 'bar', but -not from 'baz'". - -A special notation "''..''" can be used as a -short-hand for "{caret}'' ''". For example, either of -the following may be used interchangeably: - ------------------------------------------------------------------------ - $ git rev-list origin..HEAD - $ git rev-list HEAD ^origin ------------------------------------------------------------------------ - -Another special notation is "''...''" which is useful -for merges. The resulting set of commits is the symmetric difference -between the two operands. The following two commands are equivalent: - ------------------------------------------------------------------------ - $ git rev-list A B --not $(git merge-base --all A B) - $ git rev-list A...B ------------------------------------------------------------------------ +include::rev-list-description.txt[] 'rev-list' is a very essential Git command, since it provides the ability to build and traverse commit ancestry graphs. For diff --git a/Documentation/rev-list-description.txt b/Documentation/rev-list-description.txt new file mode 100644 index 0000000000..aa6bbd8cec --- /dev/null +++ b/Documentation/rev-list-description.txt @@ -0,0 +1,38 @@ +List commits that are reachable by following the `parent` links from the +given commit(s), but exclude commits that are reachable from the one(s) +given with a '{caret}' in front of them. The output is given in reverse +chronological order by default. + +You can think of this as a set operation. Commits given on the command +line form a set of commits that are reachable from any of them, and then +commits reachable from any of the ones given with '{caret}' in front are +subtracted from that set. The remaining commits are what comes out in the +command's output. Various other options and paths parameters can be used +to further limit the result. + +Thus, the following command: + +----------------------------------------------------------------------- + $ git rev-list foo bar ^baz +----------------------------------------------------------------------- + +means "list all the commits which are reachable from 'foo' or 'bar', but +not from 'baz'". + +A special notation "''..''" can be used as a +short-hand for "{caret}'' ''". For example, either of +the following may be used interchangeably: + +----------------------------------------------------------------------- + $ git rev-list origin..HEAD + $ git rev-list HEAD ^origin +----------------------------------------------------------------------- + +Another special notation is "''...''" which is useful +for merges. The resulting set of commits is the symmetric difference +between the two operands. The following two commands are equivalent: + +----------------------------------------------------------------------- + $ git rev-list A B --not $(git merge-base --all A B) + $ git rev-list A...B +----------------------------------------------------------------------- From patchwork Fri Jul 3 03:38:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin via GitGitGadget X-Patchwork-Id: 11640749 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0ADB6159A for ; Fri, 3 Jul 2020 03:38:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E41B520B1F for ; Fri, 3 Jul 2020 03:38:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bCPbDErH" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726108AbgGCDif (ORCPT ); Thu, 2 Jul 2020 23:38:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56280 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726033AbgGCDie (ORCPT ); Thu, 2 Jul 2020 23:38:34 -0400 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ECD25C08C5C1 for ; Thu, 2 Jul 2020 20:38:33 -0700 (PDT) Received: by mail-wr1-x42e.google.com with SMTP id f2so3017535wrp.7 for ; Thu, 02 Jul 2020 20:38:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=t5s1ltNGMpcuEO6GcrOf5U161SBKg5LtyTbXOVytES0=; b=bCPbDErHaoosRwjDLGgXJiTUDFz0kdQeC90dF0UxPzjBgBwjDYnVnK9tzOz5xB5yur 2b3APtayirSixyXjuSJLg2ifdpcNIlaNfNWFtmbotyE9GrdFnktXHw/fAED3GerrFx7T xLSpfK+O9VYk3YU0c5QONNk814Ts2NGGkzJDmadS+gx5OCItkMXnQcR31N+/1y3Q3RMx kB2QfWJ9YYwjLV5cCTaO+ZUi/nmMquYC5PVCzaKPzoOIXGlsGAbUtXbioFlE3kSk3iXB lfOsRFkTxa0i1Yy/P7T3/ufd27D4gHFt3u40XYzxGbBWlTY+1Cc/NycdL9cTVZOlJ+Nw e3sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=t5s1ltNGMpcuEO6GcrOf5U161SBKg5LtyTbXOVytES0=; b=ETT4rk/+SYgwy1+pV0XTVyHWY9hTUG2etokqekkk7pF5kI8YYicMgI2nJGXVCpd2QU pVb6VXl84c2BG8mTgbkIxYkcB7FE3VN9bR/inaqqEFy5Iikevx6eUvBq5UAzQe0EKq0E y/UhMlc39UGT2z2EyqK6ZQtxFP95htBm5ZIhFqkTlWhm2UqldaoH8gTQmymihNipGXid 4iPANE+dZfBgTZoLl99PT/9MpSJIbWOT93zjRaZx7Hz8KppIAC/kDMw7QYCe6WVb4BWd HQ1+PRaYOXu8EJAOT8iMp8rvsgtY09VWEbiId9kBJhxPZ5buwtzYn0K6CRkbiXaeEXaU LuCQ== X-Gm-Message-State: AOAM531KXn33fJYQfpVNPOiSRTze+/38mi+aDzZRsHtH7M5H7nv6WRdL z9ppFpA5Ekv7AvAbMjxxGLXY78nU X-Google-Smtp-Source: ABdhPJx9PfjRESg3IjcfEJ+jSZAsUynU4QkidYWiWN7AmXnaN5Ui3oMZJ1Fp0BpqB3g8aOc5TYmArQ== X-Received: by 2002:adf:9307:: with SMTP id 7mr33757630wro.414.1593747512513; Thu, 02 Jul 2020 20:38:32 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id c25sm529490wml.18.2020.07.02.20.38.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jul 2020 20:38:32 -0700 (PDT) Message-Id: In-Reply-To: References: From: "Philippe Blain via GitGitGadget" Date: Fri, 03 Jul 2020 03:38:28 +0000 Subject: [PATCH v2 3/4] git-log.txt: include rev-list-description.txt Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Lawrence Siebert , Denton Liu , Junio C Hamano , Taylor Blau , Philippe Blain , Philippe Blain Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain The `git log` synopsis mentions ``, and the description of this option links to gitrevisions(7), but a nice explanation of how a revision range can be constructed from individual commits, optionnally prefixed with `^`, also exists in `rev-list-description.txt`. Include this description in the man page for `git log`. Add Asciidoc 'ifdef's to `rev-list-description.txt` so that either `git rev-list` or `git log` appears in the respective man pages. Signed-off-by: Philippe Blain --- Documentation/git-log.txt | 3 +++ Documentation/git-rev-list.txt | 1 + Documentation/rev-list-description.txt | 23 +++++++++++++++++++++++ 3 files changed, 27 insertions(+) diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index 04ea18d1c0..d34d101255 100644 --- a/Documentation/git-log.txt +++ b/Documentation/git-log.txt @@ -15,6 +15,9 @@ DESCRIPTION ----------- Shows the commit logs. +:git-log: 1 +include::rev-list-description.txt[] + The command takes options applicable to the linkgit:git-rev-list[1] command to control what is shown and how, and options applicable to the linkgit:git-diff[1] family of commands to control how the changes diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt index b06e11ae56..5da66232dc 100644 --- a/Documentation/git-rev-list.txt +++ b/Documentation/git-rev-list.txt @@ -14,6 +14,7 @@ SYNOPSIS DESCRIPTION ----------- +:git-rev-list: 1 include::rev-list-description.txt[] 'rev-list' is a very essential Git command, since it diff --git a/Documentation/rev-list-description.txt b/Documentation/rev-list-description.txt index aa6bbd8cec..dce78561be 100644 --- a/Documentation/rev-list-description.txt +++ b/Documentation/rev-list-description.txt @@ -12,9 +12,16 @@ to further limit the result. Thus, the following command: +ifdef::git-rev-list[] ----------------------------------------------------------------------- $ git rev-list foo bar ^baz ----------------------------------------------------------------------- +endif::git-rev-list[] +ifdef::git-log[] +----------------------------------------------------------------------- + $ git log foo bar ^baz +----------------------------------------------------------------------- +endif::git-log[] means "list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'". @@ -23,16 +30,32 @@ A special notation "''..''" can be used as a short-hand for "{caret}'' ''". For example, either of the following may be used interchangeably: +ifdef::git-rev-list[] ----------------------------------------------------------------------- $ git rev-list origin..HEAD $ git rev-list HEAD ^origin ----------------------------------------------------------------------- +endif::git-rev-list[] +ifdef::git-log[] +----------------------------------------------------------------------- + $ git log origin..HEAD + $ git log HEAD ^origin +----------------------------------------------------------------------- +endif::git-log[] Another special notation is "''...''" which is useful for merges. The resulting set of commits is the symmetric difference between the two operands. The following two commands are equivalent: +ifdef::git-rev-list[] ----------------------------------------------------------------------- $ git rev-list A B --not $(git merge-base --all A B) $ git rev-list A...B ----------------------------------------------------------------------- +endif::git-rev-list[] +ifdef::git-log[] +----------------------------------------------------------------------- + $ git log A B --not $(git merge-base --all A B) + $ git log A...B +----------------------------------------------------------------------- +endif::git-log[] From patchwork Fri Jul 3 03:38:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin via GitGitGadget X-Patchwork-Id: 11640753 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A8180618 for ; Fri, 3 Jul 2020 03:38:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 896CA207E8 for ; Fri, 3 Jul 2020 03:38:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="o5l6vSlP" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726119AbgGCDih (ORCPT ); Thu, 2 Jul 2020 23:38:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56282 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726082AbgGCDif (ORCPT ); Thu, 2 Jul 2020 23:38:35 -0400 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9018AC08C5DD for ; Thu, 2 Jul 2020 20:38:34 -0700 (PDT) Received: by mail-wr1-x42b.google.com with SMTP id z13so30992472wrw.5 for ; Thu, 02 Jul 2020 20:38:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=GLQfXtzWHfQb19pFZFKpYOZDCU3wLS/gxdWh64/R6sc=; b=o5l6vSlPl2sS5NaCd/aIN8hM+cfSPkiuazak0yDNYBBLAzYCac8CvLHhwKcG1y42We AudOfqPValThb99UnIbxxbaP9T1i8cw6Uk+vwe/5fegWv8xyFbzdgps7fRRm/DxBOkIl NwT0wLuPrggH4vsHzKQ+dCAB00Yr8QqUu9WCWWuWEizD03+fWSdGNMiDtyWSsqn6rt0f 3fj/wRHBjAQNDLfpRhujkGna+Ttx0NcVFSzAhEK4tengCEGT9+7fBvBeZTppqBZjHIbw Mj+A0Ok5bAWGL+Mh6qi4QiXOE+JKBipiyxGcegMzzEpXRGG26nCcxIrBQ6zRQhYfgDrV gAAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=GLQfXtzWHfQb19pFZFKpYOZDCU3wLS/gxdWh64/R6sc=; b=ZcBocovDHE+CmS/XT9jqzHYLxFPd7N5nihBzGya21PM2JSl+WHoL0buzZ79yNFgEKw dmCJi8soDj1UA4DJlX0GEE4rsj+wG1Fy804L06CK3HmUfFLQbBzkrQzz63nTxLf3tDM4 AmgXXlRiDQnrg8/EilfkDaqDSP7OULV31YHulTkEfSePO0tfMQwtJZ0GwUPPs66V2LOE ZYG3/3Q/aaMfNQO+Rp8GNSEWOTl+vLelXZLyaEOjXT4JmuhF2D60ZFENrukL3OVQVgxd Sim+U4DwOdpsMig6VQem/KDb7Hsh/s9Mbs0YSDR7olUGh5Hzsxs4QoXPIaOsTASjBJMq 99cw== X-Gm-Message-State: AOAM532mnlSEWoeLCW9op4hOiwaOfPBWt9aMxhf9hjqzpDiLHfBNjEwY xYW8pDPbRjHzccyVsOvpDjydLaZj X-Google-Smtp-Source: ABdhPJwrtJ8tG6NdWi2LMJak9TYcr96qpaxaP4RDcy7/RIHEKz/o5uiorJWzViZYBC52ogeJgPpFjA== X-Received: by 2002:a5d:4d8b:: with SMTP id b11mr34760809wru.341.1593747513188; Thu, 02 Jul 2020 20:38:33 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id f16sm12067395wmf.17.2020.07.02.20.38.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jul 2020 20:38:32 -0700 (PDT) Message-Id: <3b923780c1f38ee183397b5766aae65933eec4aa.1593747509.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Philippe Blain via GitGitGadget" Date: Fri, 03 Jul 2020 03:38:29 +0000 Subject: [PATCH v2 4/4] rev-list-description.txt: fix Asciidoc syntax Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Lawrence Siebert , Denton Liu , Junio C Hamano , Taylor Blau , Philippe Blain , Philippe Blain Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain Using '{caret}' inside double quotes and immediately following with a single quoted word does not create the desired output: '' appears verbatim instead of being emphasized. Use a litteral caret ('^') instead. Also, remove the leading tabs in shell examples to bring them more in line with the rest of the documentation. Signed-off-by: Philippe Blain --- Documentation/rev-list-description.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Documentation/rev-list-description.txt b/Documentation/rev-list-description.txt index dce78561be..4bde2fd4fe 100644 --- a/Documentation/rev-list-description.txt +++ b/Documentation/rev-list-description.txt @@ -14,12 +14,12 @@ Thus, the following command: ifdef::git-rev-list[] ----------------------------------------------------------------------- - $ git rev-list foo bar ^baz +$ git rev-list foo bar ^baz ----------------------------------------------------------------------- endif::git-rev-list[] ifdef::git-log[] ----------------------------------------------------------------------- - $ git log foo bar ^baz +$ git log foo bar ^baz ----------------------------------------------------------------------- endif::git-log[] @@ -27,19 +27,19 @@ means "list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'". A special notation "''..''" can be used as a -short-hand for "{caret}'' ''". For example, either of +short-hand for "^'' ''". For example, either of the following may be used interchangeably: ifdef::git-rev-list[] ----------------------------------------------------------------------- - $ git rev-list origin..HEAD - $ git rev-list HEAD ^origin +$ git rev-list origin..HEAD +$ git rev-list HEAD ^origin ----------------------------------------------------------------------- endif::git-rev-list[] ifdef::git-log[] ----------------------------------------------------------------------- - $ git log origin..HEAD - $ git log HEAD ^origin +$ git log origin..HEAD +$ git log HEAD ^origin ----------------------------------------------------------------------- endif::git-log[] @@ -49,13 +49,13 @@ between the two operands. The following two commands are equivalent: ifdef::git-rev-list[] ----------------------------------------------------------------------- - $ git rev-list A B --not $(git merge-base --all A B) - $ git rev-list A...B +$ git rev-list A B --not $(git merge-base --all A B) +$ git rev-list A...B ----------------------------------------------------------------------- endif::git-rev-list[] ifdef::git-log[] ----------------------------------------------------------------------- - $ git log A B --not $(git merge-base --all A B) - $ git log A...B +$ git log A B --not $(git merge-base --all A B) +$ git log A...B ----------------------------------------------------------------------- endif::git-log[]