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: AS53758 23.128.96.0/24 X-Spam-Status: No, score=-3.9 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 2E4D71F4B4 for ; Sun, 18 Apr 2021 19:09:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232082AbhDRTJi (ORCPT ); Sun, 18 Apr 2021 15:09:38 -0400 Received: from pb-smtp1.pobox.com ([64.147.108.70]:51765 "EHLO pb-smtp1.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229488AbhDRTJi (ORCPT ); Sun, 18 Apr 2021 15:09:38 -0400 Received: from pb-smtp1.pobox.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id 656E9BF078; Sun, 18 Apr 2021 15:09:09 -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=qh+bsgbR/9aJ+NrS0ywgSZiN7Jw=; b=WPB+Rx menH+xVHd9lfcqd6+aYrvlPPUJ0zxXC1Nl6fFPuO/04iQbGcXwbiVVtNCojAqtcu UWJls4sNgiVfEY05Kkf9lyoxBT697ovvMIX+bj6+D2PcyAgwXQSOP4q7xtP/8H0J YvtdrPGCDpsK3tPbepg+NijZXLasr7T+0clms= 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=HcLs/kSsu+vRx5H0FkZNxOG9d5xYRMyp uFff2Z4Oyte19/PGxFMN6ZxxUsEVin3WyJhtegeE0IgL9+c0F5vY6mxa4BlwSkZE 8YUn26P6+p5mVoRwOTnbb3iXY5ADKCtSofUAHzfeRyIGDUsOOiIOl0Zj2m7JIxTN i/wKQd83yVE= Received: from pb-smtp1.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id 5C8C1BF077; Sun, 18 Apr 2021 15:09:09 -0400 (EDT) (envelope-from junio@pobox.com) Received: from pobox.com (unknown [34.74.119.39]) (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 C0EDABF076; Sun, 18 Apr 2021 15:09:08 -0400 (EDT) (envelope-from junio@pobox.com) From: Junio C Hamano To: Sergey Organov Cc: git@vger.kernel.org Subject: Re: What's cooking in git.git (Apr 2021, #04; Thu, 15) References: <87zgxvttvx.fsf@osv.gnss.ru> Date: Sun, 18 Apr 2021 12:09:07 -0700 In-Reply-To: <87zgxvttvx.fsf@osv.gnss.ru> (Sergey Organov's message of "Sun, 18 Apr 2021 19:55:14 +0300") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Pobox-Relay-ID: 8D5C546A-A079-11EB-B6EB-D152C8D8090B-77302942!pb-smtp1.pobox.com Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Sergey Organov writes: > Junio C Hamano writes: > > > [...] > >> >> * so/log-diff-merge (2021-04-13) 5 commits >> - doc/diff-options: document new --diff-merges features >> - diff-merges: introduce log.diffMerges config variable >> - diff-merges: adapt -m to enable default diff format >> - diff-merges: refactor set_diff_merges() >> - diff-merges: introduce --diff-merges=on >> >> "git log" learned "--diff-merges=