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 BFBDE1F5AD for ; Fri, 10 Apr 2020 22:30:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726641AbgDJWaQ (ORCPT ); Fri, 10 Apr 2020 18:30:16 -0400 Received: from pb-smtp1.pobox.com ([64.147.108.70]:56093 "EHLO pb-smtp1.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726582AbgDJWaQ (ORCPT ); Fri, 10 Apr 2020 18:30:16 -0400 Received: from pb-smtp1.pobox.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id 340104A6FC; Fri, 10 Apr 2020 18:30:14 -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=beR6deWRgzilxsuoiJqInSGpYeI=; b=ESnxYl cX0HmzCKf/CA2ojzy2hEd6ifEHXMfnL94SjmhI0sCP08qq3jxbMliPuqEmcGJCAk y5TGK/sUbUpIP4aepothysFr8HnYSqZjU1HJz1OxsHQk7psDogTKqWIc8nNcyele TKCP1xAMKNRKxfuyE5NWp31Jer/EtKFMO8Zmo= 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=S9QwvMiGs/9P+2cHN/84UK6jBqYfUjFt 2pIFLVuDhgo/HBl1Tx4t2Ey3q4a5NVu5haA4Jc7JItqZ+M5+L/70ZmPomeg4Fn39 R0/y8qqc5Cfh4CcMxPHkTPtEaCEnVV6P2OzjNw4Z6SsdV1t9kGrf/FtlSYhBC3/j 8B9vCyIdsZY= Received: from pb-smtp1.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id 2C8534A6F9; Fri, 10 Apr 2020 18:30:14 -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 ACE394A6F8; Fri, 10 Apr 2020 18:30:13 -0400 (EDT) (envelope-from junio@pobox.com) From: Junio C Hamano To: Elijah Newren Cc: Jonathan Tan , Git Mailing List , Phillip Wood , Johannes Schindelin , Bryan Turner , Sami Boukortt , Elijah Newren via GitGitGadget Subject: Re: [PATCH v2 0/3] rebase -i: mark commits that begin empty in todo editor References: Date: Fri, 10 Apr 2020 15:30:13 -0700 In-Reply-To: (Elijah Newren's message of "Fri, 10 Apr 2020 15:13:13 -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: D888C600-7B7A-11EA-A903-C28CBED8090B-77302942!pb-smtp1.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Elijah Newren writes: > On Fri, Apr 10, 2020 at 2:29 PM Junio C Hamano wrote: >> >> Junio C Hamano writes: >> >> > So I am OK to rebase the other topic to v2.26.0; would that help? I >> > already saw there was some entanglement with the other topic in one >> > of the patches in this series, so... > ... > Thanks, but wouldn't I want to base his patch on top of mine rather > than vice versa? (Since mine might be labelled bugfix, and his is a > new feature?) If you are willing to rebase the --[no-]keep-empty so that it does not depend on v2.26, that may give us a better result. I just got an impression that you somehow wanted to base your changes on the newer codebase, but if you want to base both on the older codebase, that is fine by me, too.