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=-3.8 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, T_DKIM_INVALID 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 676D61F42D for ; Wed, 30 May 2018 12:06:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751511AbeE3MGM (ORCPT ); Wed, 30 May 2018 08:06:12 -0400 Received: from cpanel4.indieserve.net ([199.212.143.9]:34122 "EHLO cpanel4.indieserve.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751352AbeE3MGL (ORCPT ); Wed, 30 May 2018 08:06:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=crashcourse.ca; s=default; h=Content-Type:MIME-Version:Message-ID:Subject: To:From:Date:Sender:Reply-To:Cc:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=NNrSNTLJOzb6m5QsCzDYSPCpS5aXeWwAvBbgk+p4Zaw=; b=nsv04ETThDA8M4r3L47DTKjqCP gjsOWsxagJpII50rIy7yUzeYFzid0wnKqm7DANolsuh6xkl/jGVEvh18A2K+s+VajVEQS5gB6pIJA kWXBlQqwWMN5249hCqfyh4L8P8nfOLIKGjt44fg8YsqPjYRLvRgVoKZMdqkhcElYa9hVTjmcdj+j2 dmM2XQBROdr6bamwQCOh6yr5YLrnqyQu2eb06VTyZyEVmg1ghtSAsXyWOhAwCCg5d6V2YjK81JIx0 U4RVbhFkM1sAQQ3V15aTqfymHaHkSsPaHfdiu8hDts9LWsutjnnsynMrjGnGUuuZCP85kX0Re6QGD 7vQEkjHg==; Received: from cpeac202e043973-cmac202e043970.cpe.net.cable.rogers.com ([174.112.22.87]:51580 helo=localhost.localdomain) by cpanel4.indieserve.net with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1fNzrl-00ERrA-98 for git@vger.kernel.org; Wed, 30 May 2018 08:06:10 -0400 Date: Wed, 30 May 2018 08:04:12 -0400 (EDT) From: "Robert P. J. Day" X-X-Sender: rpjday@localhost.localdomain To: Git Mailing list Subject: [PATCH] config.c: "incoherent" should say "inconsistent" Message-ID: User-Agent: Alpine 2.21 (LFD 202 2017-01-01) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-OutGoing-Spam-Status: No, score=-0.2 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - cpanel4.indieserve.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - crashcourse.ca X-Get-Message-Sender-Via: cpanel4.indieserve.net: authenticated_id: rpjday+crashcourse.ca/only user confirmed/virtual account not confirmed X-Authenticated-Sender: cpanel4.indieserve.net: rpjday@crashcourse.ca X-Source: X-Source-Args: X-Source-Dir: Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Signed-off-by: Robert P. J. Day --- i am simply assuming that that really should say "inconsistent"; if it's actually correct, just toss this, of course. diff --git a/builtin/config.c b/builtin/config.c index 1e31aa9f8..11c9c501d 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -656,7 +656,7 @@ int cmd_config(int argc, const char **argv, const char *prefix) } if ((actions & (ACTION_GET_COLOR|ACTION_GET_COLORBOOL)) && type) { - error("--get-color and variable type are incoherent"); + error("--get-color and variable type are inconsistent"); usage_with_options(builtin_config_usage, builtin_config_options); } -- ======================================================================== Robert P. J. Day Ottawa, Ontario, CANADA http://crashcourse.ca/dokuwiki Twitter: http://twitter.com/rpjday LinkedIn: http://ca.linkedin.com/in/rpjday ========================================================================