From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-6.3 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 106AD1F744 for ; Mon, 11 Jul 2016 20:25:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752938AbcGKUZ3 (ORCPT ); Mon, 11 Jul 2016 16:25:29 -0400 Received: from smtp-out-2.talktalk.net ([62.24.135.66]:60970 "EHLO smtp-out-2.talktalk.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752926AbcGKUZ2 (ORCPT ); Mon, 11 Jul 2016 16:25:28 -0400 Received: from localhost.localdomain ([92.22.73.13]) by smtp.talktalk.net with SMTP id MhlcbLEzMY8RwMhldbR8ll; Mon, 11 Jul 2016 21:25:26 +0100 X-Originating-IP: [92.22.73.13] X-Spam: 0 X-OAuthority: v=2.2 cv=b+Xw2ZOx c=1 sm=1 tr=0 a=R5CpdR+gL2+IAQkTIkP0Ow==:117 a=R5CpdR+gL2+IAQkTIkP0Ow==:17 a=xtxXYLxNAAAA:8 a=gt0LKDO9OWbvjQJcSk0A:9 a=xts0dhWdiJbonKbuqhAr:22 From: Philip Oakley To: GitList Cc: Junio C Hamano , Jeff King Subject: [PATCH v3 1/8] doc: use 'symmetric difference' consistently Date: Mon, 11 Jul 2016 21:25:11 +0100 Message-Id: <20160711202518.532-2-philipoakley@iee.org> X-Mailer: git-send-email 2.8.4.windows.1.3.ge328a54 In-Reply-To: <20160711202518.532-1-philipoakley@iee.org> References: <20160630202509.4472-1-philipoakley@iee.org> <20160711202518.532-1-philipoakley@iee.org> X-CMAE-Envelope: MS4wfGnSwfZzW6hY+FhV1UOE4Z8Kq+rth4ofGXjXWpS3r3uecRg94+fEyrzbOAqpSqMjlWhqu0Lm1rUkTCisGtqMb/jScH5uVZaCBJjgA3FV6T2k0qCGjVsF 80PbFDls63n550LBTBJuxWcxLR20Q1WKW7sYH5UmI1iLvqRnmIqqXQyYT4dLl31vu30wMVAPO5BK3XA1OGAPKAvS2rXq6ic9u4cP8lf78PzS62wVf6p0eMrm Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Signed-off-by: Philip Oakley --- Documentation/gitk.txt | 2 +- Documentation/rev-list-options.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt index 6ade002..6c3eb15 100644 --- a/Documentation/gitk.txt +++ b/Documentation/gitk.txt @@ -70,7 +70,7 @@ linkgit:git-rev-list[1] for a complete list. --left-right:: - Mark which side of a symmetric diff a commit is reachable + Mark which side of a symmetric difference a commit is reachable from. Commits from the left side are prefixed with a `<` symbol and those from the right with a `>` symbol. diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index 4f009d4..6dc0bb0 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@ -225,7 +225,7 @@ excluded from the output. --left-only:: --right-only:: - List only commits on the respective side of a symmetric range, + List only commits on the respective side of a symmetric difference, i.e. only those which would be marked `<` resp. `>` by `--left-right`. + @@ -766,7 +766,7 @@ ifdef::git-rev-list[] endif::git-rev-list[] --left-right:: - Mark which side of a symmetric diff a commit is reachable from. + Mark which side of a symmetric difference a commit is reachable from. Commits from the left side are prefixed with `<` and those from the right with `>`. If combined with `--boundary`, those commits are prefixed with `-`. -- 2.8.4.windows.1.3.ge328a54