From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: ** X-Spam-ASN: X-Spam-Status: No, score=2.7 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, LIST_MIRROR_RECEIVED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,SPF_HELO_NONE, SPF_PASS shortcircuit=no autolearn=no autolearn_force=no version=3.4.6 Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org [IPv6:2604:1380:45e3:2400::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 0D2981F406 for ; Fri, 20 Oct 2023 22:07:37 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (1024-bit key; unprotected) header.d=pobox.com header.i=@pobox.com header.a=rsa-sha256 header.s=sasl header.b=Eq8fdoyh; dkim-atps=neutral Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id DC9AD2826ED for ; Fri, 20 Oct 2023 22:07:36 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id BFB273419A; Fri, 20 Oct 2023 22:07:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=pobox.com header.i=@pobox.com header.b="Eq8fdoyh" Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E382132C82 for ; Fri, 20 Oct 2023 22:07:26 +0000 (UTC) Received: from pb-smtp20.pobox.com (pb-smtp20.pobox.com [173.228.157.52]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 41998A3 for ; Fri, 20 Oct 2023 15:07:25 -0700 (PDT) Received: from pb-smtp20.pobox.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id A26F8338F7; Fri, 20 Oct 2023 18:07:24 -0400 (EDT) (envelope-from junio@pobox.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=pobox.com; h=from:to:cc :subject:in-reply-to:references:date:message-id:mime-version :content-type; s=sasl; bh=Pao3oojFecnWQBiogGzGE/gAttRezXO3Fr9Mgr DNYmU=; b=Eq8fdoyho964iz3eLU3idGSkOPwFzdGmAy5yTqFMMSJ9WoIxQnQCmO rpaCEQqjNmwbiHGPbxXX+k01qld/z7LJK6ONZ72l+WLXt4rxqUNkKNO0ry5XhdQP oe1rz8Pv7lIIs31g1ys7XUXWUgTljHBC8UadmX24CFcXr+X6klxtA= Received: from pb-smtp20.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id 9C218338F6; Fri, 20 Oct 2023 18:07:24 -0400 (EDT) (envelope-from junio@pobox.com) Received: from pobox.com (unknown [34.125.153.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp20.pobox.com (Postfix) with ESMTPSA id 3631F338F5; Fri, 20 Oct 2023 18:07:21 -0400 (EDT) (envelope-from junio@pobox.com) From: Junio C Hamano To: Oswald Buddenhagen Cc: git@vger.kernel.org Subject: Re: [PATCH v3 0/3] rebase refactoring In-Reply-To: <20231020093654.922890-1-oswald.buddenhagen@gmx.de> (Oswald Buddenhagen's message of "Fri, 20 Oct 2023 11:36:51 +0200") References: <20230809171531.2564844-1-oswald.buddenhagen@gmx.de> <20231020093654.922890-1-oswald.buddenhagen@gmx.de> Date: Fri, 20 Oct 2023 15:07:19 -0700 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: , MIME-Version: 1.0 Content-Type: text/plain X-Pobox-Relay-ID: 0A8501F2-6F95-11EE-9C88-F515D2CDFF5E-77302942!pb-smtp20.pobox.com List-Unsubscribe-Post: List-Unsubscribe=One-Click Oswald Buddenhagen writes: > broken out of the bigger series, as the aggregation just unnecessarily holds it > up. > > v3: removed "stray" footer. so more of a RESEND than an actual new version. > > Oswald Buddenhagen (3): > rebase: simplify code related to imply_merge() > rebase: handle --strategy via imply_merge() as well > rebase: move parse_opt_keep_empty() down > > builtin/rebase.c | 44 ++++++++++++++------------------------------ > 1 file changed, 14 insertions(+), 30 deletions(-) Looking quite straight-forward and I didn't see anythihng potentially controversial. Will queue. Thanks.