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: AS54825 147.75.80.0/22 X-Spam-Status: No, score=-3.7 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_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from am.mirrors.kernel.org (am.mirrors.kernel.org [147.75.80.249]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 4E2BE1F405 for ; Thu, 1 Feb 2024 14:02:53 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=MMtOMCqV; 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 am.mirrors.kernel.org (Postfix) with ESMTPS id 9C3F41F29185 for ; Thu, 1 Feb 2024 14:02:51 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4F84A5D492; Thu, 1 Feb 2024 14:02:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="MMtOMCqV" Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8268F5D47D for ; Thu, 1 Feb 2024 14:02:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706796159; cv=none; b=PzuYFp62oJZ0DKqmfKTjjfoh7ZdAg/fmF2VBhUIJ2Auc9BuUFeqwdXiEW0Ra8aghVosqNxqEimBAU4V/n7SmWED4kHHV4UWSC5CjDTRYqiCcXFQ39fEpH+8ZbtLSW0ew5qTmDxMmRBT5vFpMayfoWBiUibzn/EIgywKwiVcwPaM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706796159; c=relaxed/simple; bh=v+VQThbLcZwCXqFNg2io5NW1rHX2/EjQxKJFaXxh0hk=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=IZYbUql31J+RLeZ1Qq4QONgo4OuAYRWeno4jD8dnkC5QmjqUi7a8HBWSDRoBx+3Nol8lnrlr9R0CeYLov1HB23qRljJMW27z0QLad+MtvGjtt4BnLbiAdu2ckP8yUPz0WIQQigN+dv0PzLjlglGIJmCdl/wZWCIVKovZ7EveaZU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=MMtOMCqV; arc=none smtp.client-ip=209.85.128.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-40e7065b7bdso8086705e9.3 for ; Thu, 01 Feb 2024 06:02:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706796155; x=1707400955; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:reply-to:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=qtEb3uPG3Hk6+9WlQSE5UxdHjHDsx8KuYQjL3t+wURo=; b=MMtOMCqV5BcDLTk3PB0oOC7Hi+s6Wnbyaf6P0tbbvMdtsUCj+vBdggMoi4FLepeL0r J4QdtDOBZPoV5/2b4XR7bpHeVru96iGZrreUX+lrwFJeYVPQIQOB23qvjdHyfuh1k/aT cCP4w9bP3lQ9+Zq0S2NIZd67Ko9UuE5uNzW06QozJ76dp3v0neNflCsl1Y3o0VWAnf3+ 5FENwDANKAeJ8LT/dg8/dkhCiuub6+x1sqXuJRAD0vZP31YAsNEVNeVzW5XNA8WnZz0C hhMoxC9WZT2/gCBi8tKwRI5QWF7bYwCXVOM1l5cltI6CW5/n2Jix5fqmiqADfpLhl5ML FmxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706796155; x=1707400955; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:reply-to:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=qtEb3uPG3Hk6+9WlQSE5UxdHjHDsx8KuYQjL3t+wURo=; b=dr6o1hxj7uC9KpEJQPne6Ca2FMo+c+ScwqQfxqPgZMLr/xpO56HVTKe8H6WntLpnAf +Q5M2MVWFIXFn/xiuHgn/cELkbSd8CklH8B4uoh+i3YaarHtGE079xQ2/cqaGuomTlEO eb3toTmrf0Z+Pvm9dAp4jYVG9IMaihU51BGz5SypIWpTnZ0b21iibqfVGUODoBFTV29A eEqzsFlgfU+ZNN3WDh9oTEUjiasAbeSfQwmSz66IwMInK7MElNkKaDerNigMcp9MbXSl KOlyfWmo3zB33WzXJphzO1NhBiQe+p2tzZXUJ9C9FandW0UOofsHao/vjN47QK5PyvX2 5XaQ== X-Gm-Message-State: AOJu0YzjPg10Y3nuIhHTVGxk+DgYBgAG2umVNlOTvxPTYIbOSRyNcPFk DnW6JTHN+/vLPwxI3sLXWO3l7O2jZPsST9HG+qffZyGuPbYXkA6j X-Google-Smtp-Source: AGHT+IHo12rCGJ5N4FZ3I7ttKznD/iAoCiG4p/A++WMgq7mLdmkSh83OJLASaGH6YEwAVki2lmjI0g== X-Received: by 2002:a05:600c:a3a5:b0:40f:afd6:b266 with SMTP id hn37-20020a05600ca3a500b0040fafd6b266mr1821759wmb.18.1706796155436; Thu, 01 Feb 2024 06:02:35 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCVAj3mmrR0btl3qQPqkxPxhbTj0+cvdNU5CqACZsgmnVv5Y1E0Sbv7qIrEXfEEWJCcK8c/3qoHCOodog0xTbmZ4xAeZwC4pH7y21p5UMndHZYeeguNuPhbq2Y/BKeNhlAFpR3fa1sYb4HuCU81V Received: from ?IPV6:2a0a:ef40:62e:a901:d2c6:37ff:fef6:7b1? ([2a0a:ef40:62e:a901:d2c6:37ff:fef6:7b1]) by smtp.googlemail.com with ESMTPSA id o7-20020a05600c510700b0040e880ac6ecsm4595341wms.35.2024.02.01.06.02.35 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 01 Feb 2024 06:02:35 -0800 (PST) Message-ID: <20b6c81a-b1cf-4d10-980b-94698d7e62aa@gmail.com> Date: Thu, 1 Feb 2024 14:02:35 +0000 Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Reply-To: phillip.wood@dunelm.org.uk Subject: Re: [PATCH 3/4] rebase: Update `--empty=ask` to `--empty=drop` Content-Language: en-US To: Brian Lyles , phillip.wood@dunelm.org.uk Cc: git@vger.kernel.org, me@ttaylorr.com, newren@gmail.com References: <20240119060721.3734775-2-brianmlyles@gmail.com> <20240119060721.3734775-4-brianmlyles@gmail.com> <7032ae96-602f-499d-8430-a5dc3864d1bb@gmail.com> From: Phillip Wood In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Hi Brian On 27/01/2024 21:49, Brian Lyles wrote: > On Tue, Jan 23, 2024 at 8:24 AM Phillip Wood wrote: >> On 19/01/2024 05:59, brianmlyles@gmail.com wrote: >>> From: Brian Lyles >>> >>> When `git-am` got its own `--empty` option in 7c096b8d61 (am: support >>> --empty=