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.0 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 A91FB1F466 for ; Mon, 30 Dec 2019 21:49:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727723AbfL3VtJ (ORCPT ); Mon, 30 Dec 2019 16:49:09 -0500 Received: from pb-smtp1.pobox.com ([64.147.108.70]:62050 "EHLO pb-smtp1.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727691AbfL3VtJ (ORCPT ); Mon, 30 Dec 2019 16:49:09 -0500 Received: from pb-smtp1.pobox.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id 306633BFEC; Mon, 30 Dec 2019 16:49:07 -0500 (EST) (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=fo4he9hT1SxnuGfdriGDiJJNhNM=; b=iC/sSy 6pwSB6cbs94VIu8FdZIrti8eJJLEfHeBauyKho900qQQMEwZho3mqlWbJnNk97v6 dpK7BiSxjx7AQ/cBBnaIcukXv5nQJfTfnEmfBczw0FhvMVtUfdcOqTFE8Ldzj7S7 VFFnEo/1tPsgIKWSZMpx0UWn9pPTUP+oMO1pY= 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=JwnNYUljoV5w0NJDGjz5Oh1JA8mt9E7Q mMwFJEoiE9wMbhZnPug3iq0jzEnC2LjG8kUVra3DuGNsDJe+AC7D3Hg0adqza/ZV DdQkShWKGaWWOLSJQjbDNLgmG/AYywcdTW7lml2nU2C+IitFcZIw68wYfL/GOdCA /0/F5Ldecrw= Received: from pb-smtp1.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id 279AC3BFEB; Mon, 30 Dec 2019 16:49:07 -0500 (EST) (envelope-from junio@pobox.com) Received: from pobox.com (unknown [34.76.80.147]) (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 791603BFEA; Mon, 30 Dec 2019 16:49:06 -0500 (EST) (envelope-from junio@pobox.com) From: Junio C Hamano To: Denton Liu Cc: Git Mailing List , Alban Gruin , Johannes Schindelin , Phillip Wood Subject: Re: [PATCH v2 00/17] merge: learn --autostash References: Date: Mon, 30 Dec 2019 13:49:05 -0800 In-Reply-To: (Denton Liu's message of "Tue, 24 Dec 2019 06:04:57 -0500") 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: 33D2AF58-2B4E-11EA-B4AC-C28CBED8090B-77302942!pb-smtp1.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Denton Liu writes: > Alban reported[1] that he expected merge to have an --autostash option, > just like rebase. Since there's not really any reason why merge can't > have it, let's implement it in this patchset. Sigh. I would actually have preferred to remove the autostash from rebase if the goal is to have a consistent behaviour between the two, though ;-) But it is OK as long as it does not degrade the codepath with changes that wouldn't have been necessary if this weren't added. Let's see how it goes. Queued.