From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 758DE1F463 for ; Thu, 26 Dec 2019 17:43:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726654AbfLZRnk (ORCPT ); Thu, 26 Dec 2019 12:43:40 -0500 Received: from mail-ed1-f68.google.com ([209.85.208.68]:37014 "EHLO mail-ed1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726578AbfLZRnk (ORCPT ); Thu, 26 Dec 2019 12:43:40 -0500 Received: by mail-ed1-f68.google.com with SMTP id cy15so23251738edb.4 for ; Thu, 26 Dec 2019 09:43:39 -0800 (PST) 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=I8f3xSDsUXIfoZkionzYqDbsTTalc1rHn66p4RC8so8=; b=oStFr1rRUxjUeN7GHVSra8zght8g8f+4b/lFUadqY/kUpn7xcgaYD6fQyvzGLLDD7g j1HCn/AdkwCwhpZ/yzYAqAs0OLhUwWabqJIpa5obdmZhuTbwuiwsJ5p6CwMeQX0rua7V WKXbq31rdGEiYWSIWWtBs5EzNKAMkLPeRVW8pFo5dlj4rwSWm6njEgH33mGynsKY1779 iA1ICJYn40o8SLDLW6418Q8F23Dlm476kZkfu5KNDPfSazM/XTTxaaaP34fwfVrlW4Cf An+te5TsBwzXReS2Tk1Jj+13ralvUgmCbCNKeSV0oBg/46dhESEH6vbuHYRH4A0zXSgx peBQ== 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=I8f3xSDsUXIfoZkionzYqDbsTTalc1rHn66p4RC8so8=; b=MDPKZ1UOBP6EuSMOrro7yzSHeFNoYaLalDRMGDJ2hv9Sz289Vy8FAJFqAVmc/UQma7 liWGDHxMIPGHTZU9zZqj+BLD5dkNPKuHiJ5ZnKd79SHAhNYwCcY7BHqhCvZfI3DTGpcc Dyk1KVs+ifwYqyCDLe3tCrjb8YcLZl6HneE2hHHNK41NM+pMgEu2i/05EILTQF2VHsZD R/RsTKcvqqyW9BZ9jnxposF/4uTcta2w1NXFr01UM5N3JicBkno/DlKzuvM+QBoAGfGp YuciTBql41MwV+n9/hjihkBmp4q21Yazk95/0jJjds6tKugvkKB/f86G/i8x9/szBlyY coeg== X-Gm-Message-State: APjAAAXm8yqLg3+nmluCdLeGcte4E8xCGi//XqigfA0rGgupdrcqBPfH CmyL9yT2GRfBs0Op/tCMXhY20i6L X-Google-Smtp-Source: APXvYqzPbFM++7xXD5uVdB0itMvlqVYMpwKApQU7lcMnqHGWwmoUYHPeKT6GyyZ8trYFT/Js83QnEw== X-Received: by 2002:a50:fc85:: with SMTP id f5mr50997345edq.294.1577382218980; Thu, 26 Dec 2019 09:43:38 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id e21sm3653673eds.36.2019.12.26.09.43.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Dec 2019 09:43:38 -0800 (PST) Message-Id: In-Reply-To: References: From: "Philippe Blain via GitGitGadget" Date: Thu, 26 Dec 2019 17:43:36 +0000 Subject: [PATCH v2 1/2] doc: log, gitk: document accepted line-log diff formats Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: Thomas Rast , Junio C Hamano , Matthieu Moy , SZEDER =?UTF-8?Q?G=C3=A1bor?= , Derrick Stolee , Junio C Hamano , Philippe Blain Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain Currently the line-log functionality (git log -L) only supports displaying patch output (`-p | --patch`, its default behavior) and suppressing it (`-s | --no-patch`). A check was added in the code to that effect in 5314efaea (line-log: detect unsupported formats, 2019-03-10) but the documentation was not updated. Explicitly mention that `-L` implies `-p`, that patch output can be suppressed using `-s`, and that all other diff formats are not allowed. Signed-off-by: Philippe Blain --- Documentation/git-log.txt | 5 ++++- Documentation/gitk.txt | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index b406bc4c48..6574c0d91f 100644 --- a/Documentation/git-log.txt +++ b/Documentation/git-log.txt @@ -77,7 +77,10 @@ produced by `--stat`, etc. not give any pathspec limiters. This is currently limited to a walk starting from a single revision, i.e., you may only give zero or one positive revision arguments. - You can specify this option more than once. + You can specify this option more than once. Implies `--patch`. + Patch output can be suppressed using `--no-patch`, but other diff formats + (namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`, + `--name-only`, `--name-status`, `--check`) are not currently implemented. + include::line-range-format.txt[] diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt index 1eabb0aaf3..c487af5b74 100644 --- a/Documentation/gitk.txt +++ b/Documentation/gitk.txt @@ -106,7 +106,10 @@ linkgit:git-rev-list[1] for a complete list. not give any pathspec limiters. This is currently limited to a walk starting from a single revision, i.e., you may only give zero or one positive revision arguments. - You can specify this option more than once. + You can specify this option more than once. Implies `--patch`. + Patch output can be suppressed using `--no-patch`, but other diff formats + (namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`, + `--name-only`, `--name-status`, `--check`) are not currently implemented. + *Note:* gitk (unlike linkgit:git-log[1]) currently only understands this option if you specify it "glued together" with its argument. Do -- gitgitgadget