From patchwork Fri Nov 23 11:16:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phillip Wood X-Patchwork-Id: 10695585 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 4C3B513AD for ; Fri, 23 Nov 2018 11:17:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 399052C85C for ; Fri, 23 Nov 2018 11:17:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 286F62C885; Fri, 23 Nov 2018 11:17:17 +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,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 61CCD2C85C for ; Fri, 23 Nov 2018 11:17:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2394331AbeKWWBF (ORCPT ); Fri, 23 Nov 2018 17:01:05 -0500 Received: from smtp-out-1.talktalk.net ([62.24.135.65]:48849 "EHLO smtp-out-1.talktalk.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730669AbeKWWBE (ORCPT ); Fri, 23 Nov 2018 17:01:04 -0500 Received: from lindisfarne.localdomain ([92.22.32.73]) by smtp.talktalk.net with SMTP id Q9SMg52vNwhzSQ9SSg6d1n; Fri, 23 Nov 2018 11:17:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=talktalk.net; s=cmr1711; t=1542971833; bh=hWW9Ip0eOtL8RZZi12AwrhDHhdAPaI9JPJVSuvQ4RhM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=cG3EkijfC+Lvhht5I89YtZF/F93HDovvGq3VupTuKRma3pkZDPtf+B9J/KPZqVcUX Dc7SkKcSB2IW1Uj7uR/wsAK/AbGqFXIPyFlB47FdmikVj8Y1AwbMVGcv7Vfsdhfx10 3B+U1gFjp9+my9pio4OxUvI9RpdCcu5aiJVusqRk= X-Originating-IP: [92.22.32.73] X-Spam: 0 X-OAuthority: v=2.3 cv=e8Iot5h/ c=1 sm=1 tr=0 a=w3K0eKD2tyZHkEydg3BQCA==:117 a=w3K0eKD2tyZHkEydg3BQCA==:17 a=evINK-nbAAAA:8 a=sgcJ5tVGo-PX1bOlNW4A:9 a=aPqGf9fwU8MMLC3g:21 a=2vQo7RDd6zDzV5U6:21 a=RfR_gqz1fSpA9VikTjo0:22 From: Phillip Wood To: Git Mailing List , Stefan Beller , Junio C Hamano Cc: Phillip Wood Subject: [PATCH v2 1/9] diff: document --no-color-moved Date: Fri, 23 Nov 2018 11:16:50 +0000 Message-Id: <20181123111658.30342-2-phillip.wood@talktalk.net> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181123111658.30342-1-phillip.wood@talktalk.net> References: <20180924100604.32208-1-phillip.wood@talktalk.net> <20181123111658.30342-1-phillip.wood@talktalk.net> MIME-Version: 1.0 Reply-To: Phillip Wood X-CMAE-Envelope: MS4wfEY3G6n8ycEBsdxHzH/SEtNYCamnEOCutBxmZBSf5WvgqCBUNuQVreqfYlYIIEI+QyYHprXc036Yhdxb6jcuzkmFZssDLaX3uIvDjNDZoKUYCodGjCij x+t9YjvmHP/5bLAXlf1GVyqeobhdzZ/aLkijL0U8VV01zXaj5tZONEYHOHXhhtbpGxEejptPvea32IoVXPdSmmMniCh5GJkTDzj8iy7MzFWl1nIqiwW3OU2j KI/bdMy1Hhj5V6VfLvEAaPYQBk3/lxM9YIDk/+rQQdjIJ5qDowobYuKfh3L31Lrz Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Phillip Wood Add documentation for --no-color-moved. Signed-off-by: Phillip Wood --- Documentation/diff-options.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 0378cd574e..151690f814 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -293,6 +293,10 @@ dimmed-zebra:: `dimmed_zebra` is a deprecated synonym. -- +--no-color-moved:: + Turn off move detection. This can be used to override configuration + settings. It is the same as `--color-moved=no`. + --color-moved-ws=:: This configures how white spaces are ignored when performing the move detection for `--color-moved`.