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-Status: No, score=-4.0 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 1DFDE1F66E for ; Wed, 12 Aug 2020 00:48:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726472AbgHLAs2 (ORCPT ); Tue, 11 Aug 2020 20:48:28 -0400 Received: from pb-smtp1.pobox.com ([64.147.108.70]:65080 "EHLO pb-smtp1.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726143AbgHLAs1 (ORCPT ); Tue, 11 Aug 2020 20:48:27 -0400 Received: from pb-smtp1.pobox.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id 2AA3A86144; Tue, 11 Aug 2020 20:48:24 -0400 (EDT) (envelope-from junio@pobox.com) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; s=sasl; bh=Fds5FqZ0sFplkp5Rin7yQgCybBg=; b=T9lJb7 Hre1wgCipTXcpuCg2uXOMPCMl9nKYeDG1L6RUIkpX8cGe735Jgsg6NAvZKbioofg xdQabWvjb4ObpUN4PwKxHVq/Akc/Kn1/p1eECyX8RNzZpm5ZKzEaVoIL4J/jRBR+ /Ra/748vFlyLzWvy1KWRyWC1+VPLMsnXJ98WQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; q=dns; s=sasl; b=TMYS38V1i0A0Eidm8MAxx+wk1L2l6qxU k5/bcqDaNW1/DgEVm7IO25tulmJj2lSUSDbzyLp8L/X79YUWHigh7Px+slkS4OUA 0c+wo2NPKmpAjZ5AqGEmJ06drFj8X3OWOfqWgbSZICuj6/LQHDrgAQgGopY6DaDZ Tmk5DxDPVPw= Received: from pb-smtp1.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id 226BE86143; Tue, 11 Aug 2020 20:48:24 -0400 (EDT) (envelope-from junio@pobox.com) Received: from pobox.com (unknown [35.196.173.25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp1.pobox.com (Postfix) with ESMTPSA id A4C8686142; Tue, 11 Aug 2020 20:48:23 -0400 (EDT) (envelope-from junio@pobox.com) From: Junio C Hamano To: Sergey Organov Cc: Jeff King , git@vger.kernel.org Subject: Re: [PATCH 2/3] doc/git-log: describe --diff-merges=off References: <20200805220832.3800-1-sorganov@gmail.com> <20200805220832.3800-3-sorganov@gmail.com> Date: Tue, 11 Aug 2020 17:48:22 -0700 In-Reply-To: (Junio C. Hamano's message of "Tue, 11 Aug 2020 17:06:56 -0700") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Pobox-Relay-ID: 868C369A-DC35-11EA-A2DC-01D9BED8090B-77302942!pb-smtp1.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Junio C Hamano writes: > Sergey Organov writes: > >> Signed-off-by: Sergey Organov >> --- >> Documentation/git-log.txt | 6 +++++- >> 1 file changed, 5 insertions(+), 1 deletion(-) >> >> diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt >> index 9ccba65469d7..f3727c786453 100644 >> --- a/Documentation/git-log.txt >> +++ b/Documentation/git-log.txt >> @@ -145,7 +145,6 @@ combined-diff option or with `--no-diff-merges`). >> rename or copy detection have been requested). >> >> -m:: >> ---diff-merges:: > > Shouldn't this "--diff-merges" be removed from here? Sorry, my eyes. Yes, you are removing it from here. All is well, then.