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=-4.1 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 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 F165320A1E for ; Sun, 9 Dec 2018 09:03:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726125AbeLIJDE (ORCPT ); Sun, 9 Dec 2018 04:03:04 -0500 Received: from mail-io1-f49.google.com ([209.85.166.49]:35148 "EHLO mail-io1-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726090AbeLIJDE (ORCPT ); Sun, 9 Dec 2018 04:03:04 -0500 Received: by mail-io1-f49.google.com with SMTP id i1so4523605ioo.2 for ; Sun, 09 Dec 2018 01:03:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=KLXbuzX/DSvFoPxD7EOuUzsnpnQjfCgFDQGtTNWFyOI=; b=KN206AWcErcgolba9jWyA8TUq0YR+pMpKlpQG6YaXnu8yuqSRIg2K81Ua60JrpuvAx UDU2zJPFXjSauHDaoT+xQZHKIrvASaEsUypiGUUcPPV1/YjgSX7/DjIgTW6YQVC8ZyG7 HGK5Y2NRVG7gaQSV4M6kj6G7Rfwcg+lf2Zqbd/BNRuZE2XeZD4CR8O7ESV8cI+XhspuT OvC/saW59DHfV47f9hchGd9olZ4xYXeqXzBXm9kV5Xg9/lvtmtyJFrU9B+RzuD+lVvkm vFvC82ASRMEoPg6SkFLkK7nzFfmjhxWBn+QS1EhEbeT9FCzJlN0qsd7z+tZ7JYdUIqbH ZGpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=KLXbuzX/DSvFoPxD7EOuUzsnpnQjfCgFDQGtTNWFyOI=; b=uToeOhn4n3kX4mgk8gr1szoISCRwvWKs/JMHNVtNqs0y6HUXeQyjTEzpHa2QZYNwP1 QkRv8qDxi9EgPOTKwARjfVSJ/o7AY8PNcuhvyA4MBdtOxoX3gqiIBHBtoJ1o/UrWyDdi 5O7k0uwZ3N+q6e9MFNDixBTBpzrIwC/cpkZdS5nQqZyr7OCh5qDctREu9ha6+9+FMzod 0elV0oFUZQKxANJiHs1NK7fZ0dDg+dNW8/emtylDzanETnMUF/zStHWC33mSv2S9pFWs WcXK2VEuxO8xAWyf1qwcEJv5Xgm4jFFSJjU0Qh3ixYGA6owSMbHaKDK5xlLeYEg8BrIF yUHg== X-Gm-Message-State: AA+aEWbXUP8dxebSzYONaxLHcf9UFq+FPdahYldVcg1JNTHks7635Aem RHa1O6GDioj+yUzeWpBA0cI= X-Google-Smtp-Source: AFSGD/W6VgjYz+C+BUabt1v5e5SUUG/0H6LD/mOZZUyTIA8A1S3lsjiJPF/1atKq//SGjbOrPXgLaw== X-Received: by 2002:a5d:959a:: with SMTP id a26mr6740259ioo.278.1544346182848; Sun, 09 Dec 2018 01:03:02 -0800 (PST) Received: from archbookpro.localdomain (ktnron0919w-grc-01-76-68-140-144.dsl.bell.ca. [76.68.140.144]) by smtp.gmail.com with ESMTPSA id s13sm3530461iop.36.2018.12.09.01.03.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 09 Dec 2018 01:03:02 -0800 (PST) Date: Sun, 9 Dec 2018 04:03:00 -0500 From: Denton Liu To: Junio C Hamano Cc: git@vger.kernel.org Subject: Re: What's cooking in git.git (Dec 2018, #01; Sun, 9) Message-ID: <20181209090300.GA32640@archbookpro.localdomain> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.11.1 (2018-12-01) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Sun, Dec 09, 2018 at 05:42:27PM +0900, Junio C Hamano wrote: > * dl/merge-cleanup-scissors-fix (2018-11-21) 2 commits > (merged to 'next' on 2018-11-21 at 217be06acb) > + merge: add scissors line on merge conflict > + t7600: clean up 'merge --squash c3 with c7' test > > The list of conflicted paths shown in the editor while concluding a > conflicted merge was shown above the scissors line when the > clean-up mode is set to "scissors", even though it was commented > out just like the list of updated paths and other information to > help the user explain the merge better. > > Will cook in 'next'. >From our discussion[1], expect a reroll with the ability to do scissors cleanup in messages generated by git-merge. Unfortunately, it'll be a couple of weeks because of finals season. > > * dl/remote-save-to-push (2018-11-13) 1 commit > - remote: add --save-to-push option to git remote set-url > > "git remote set-url" learned a new option that moves existing value > of the URL field to pushURL field of the remote before replacing > the URL field with a new value. > > I am personally not yet quite convinced if this is worth pursuing. Any way I could convince you otherwise? I guess this could be rolled into a helper script but it'd be very useful to have the behaviour standardised into the actual remote builtin. [1]: https://public-inbox.org/git/xmqqin0n44dv.fsf@gitster-ct.c.googlers.com/