From patchwork Sat Feb 10 07:43:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Lyles X-Patchwork-Id: 13552211 Received: from mail-oa1-f49.google.com (mail-oa1-f49.google.com [209.85.160.49]) (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 5E07832C84 for ; Sat, 10 Feb 2024 07:49:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707551379; cv=none; b=l04XYR8t7SzA4WBlzyHJO7+ZXxoHy8Z+dVg89bvDw6WxsGxMS0xU0EPFZCgWgWZ2tdImP0Uo8ImZlRq4BjC+lr9VyjhwosBYhrSMHRqxwzVGGYvrw7su7WpOiTENUpKR4ur+rBPDYYYfW6jRJkARJor5bGzOGOL8Zt+U3Nw3WB4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707551379; c=relaxed/simple; bh=UTSQCEaaYgNxc3/nNlgbLBmJiW+dJn6Ylw5Chyx8mEk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=diqVEQuBztCpHlPrcMR+5WxIhYkICy0nw/DOLt2KaKbN7y4wiTTkTHawpuhjEAaco8xns6ywULx/5ivZoPFs10YoKePPQXy1zkp9HHYx+/vxBEkm4LRk0kG0Ey7CBPgGzQsQxuG/9OEzVDrKMvNfOOOPmK04C3FoVUVWPrwqkjE= 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=R0Svi/gk; arc=none smtp.client-ip=209.85.160.49 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="R0Svi/gk" Received: by mail-oa1-f49.google.com with SMTP id 586e51a60fabf-21433afcc53so906244fac.3 for ; Fri, 09 Feb 2024 23:49:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707551375; x=1708156175; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zRc0j29e+gpK6/q+Wi6Bf2dlMDQWZ1sJGeLZybtIyWc=; b=R0Svi/gkvwuPI6MUVtoyk9WGN79m8fBEOUlEQdvg6jIuCvQcFESb9hsFQ9d3PVcIBi Ho+++N/ZC2ZsrnlGCGR9oNFJxJtvhWrzzBVV/j9pkdaBzw8ytrhKQfpD7xAv4luPTbtw L9Sb0qCA7gmX75CAy2qtLt+FTZy7XVnUzU5hl7mktOL/GIuCxQVmt+y1zn8gAu+C9CNf pLdg3+wQIbQ2LFAKktBkSODEBDwgo8ZIHaNPrUclUliZluwRO1+0NMpdZvJESm4swGII uI1dp/jb0GGuSX4AHA0zapUYbgdyJd1rNefU3flcSogjXKSsYjK1p+NilwlwbbGY6N8z Ds8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707551375; x=1708156175; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zRc0j29e+gpK6/q+Wi6Bf2dlMDQWZ1sJGeLZybtIyWc=; b=axcvMw823d49Mk09J0+vl7n3CFBqQFnIoBMrEOWLjwd5LPIx6b5IQqqodr4SUHmDoL 4diEFlfE5b+DsNTAxfa/fr5kbRDJGVCtzI6w5T/izxPIusLOTJmKB6WVAWzPBF5YE7Rg 3SQYCXoQY+2V9KM0Yk1Owfa4ba0bTAgrZqUP9y5ZeKs7OPBkeSAXwBGAe4qbwVxqMIhT QjE8okkBWA6x4hHIFOOdtA1vCNXKCvF1QjNwO0Xn1d1XVLG6TltlRPxVOBwU772nWJtq Jd8M+LMNLTtzlhMDrGiys7w6d+kQmuStm8EJxNHPtGzHnOTyDl84LjmYuK3K3U4jRlGY 5zDA== X-Gm-Message-State: AOJu0Yxl6IjJ8D1Jk+OLU0/Iv1KE7p1BCqK5D0d88+BWlT48EQbAmMUo cR/B1C/qDb0i9EXTirfCMBFbUbi+oqTxj2p13LM4boT13kt+fpQQwPF5NxSmSJI= X-Google-Smtp-Source: AGHT+IHTDbAtEharXj+THY3tUcil/AQDh+jbNnpj42vNpcdRCg/TDKLGeO2NuBpvgPCbQcJ0ZPuAow== X-Received: by 2002:a05:6870:3325:b0:218:df68:87b2 with SMTP id x37-20020a056870332500b00218df6887b2mr1827366oae.44.1707551375438; Fri, 09 Feb 2024 23:49:35 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCUqRSm4RrQvDvQvPCtSlPoBINN3Af4HxYwxdLDZ7jp/Xrw2vhdTryYmdgP7E/mD9nwuuwyLPzUDXDkkj/OAwQKGh0w0KmD75c9rzv6MlMEwSuzgAtg4Mft1JQ40Xmnq422VRpWS2gpK+872VKqRlTKgaDRwS6Hs+4ZFySxCiZu/ Received: from localhost.localdomain (047-034-027-162.res.spectrum.com. [47.34.27.162]) by smtp.gmail.com with ESMTPSA id v19-20020a056870955300b00219fd9e3194sm310028oal.7.2024.02.09.23.49.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Feb 2024 23:49:34 -0800 (PST) From: Brian Lyles To: git@vger.kernel.org Cc: Brian Lyles , newren@gmail.com, me@ttaylorr.com, phillip.wood123@gmail.com, gitster@pobox.com Subject: [PATCH v2 3/8] rebase: update `--empty=ask` to `--empty=drop` Date: Sat, 10 Feb 2024 01:43:51 -0600 Message-ID: <20240210074859.552497-4-brianmlyles@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240119060721.3734775-2-brianmlyles@gmail.com> References: <20240119060721.3734775-2-brianmlyles@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 When git-am(1) got its own `--empty` option in 7c096b8d61 (am: support --empty=