Message ID | 20240909141109.3102-1-alexhenrie24@gmail.com (mailing list archive) |
---|---|
Headers | show
Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (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 5B5DE1BA263 for <git@vger.kernel.org>; Mon, 9 Sep 2024 14:11:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725891094; cv=none; b=WVmOisaEz8YoRFtCF3W9Wck+ynyRtdT/jbNBLAoG3e6rt9KQrXvMw5mLIAeuwIZtOc2c38pN5JEQj1G54vIrUKTsjNSOjnKrLf5xIi+T0HfuneIUnZw5Lqq9N8nUQNYmt198ueQL1D9f9KHwVB0m/8vF0oZrTdiAANPq9288WX0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725891094; c=relaxed/simple; bh=Nyq0vF216EnBTdN9na7+LKm5F7rTsUX4RuromvtLoA4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LEBvN0PLSL1fmyIMQlpLQDne1dY3xW11PbxK23KWRoLamqo5riD3Czo2EKsGOunXXBDrR16nd/Z0IgY6U3PkCRIeh0gHViBzqXDVmWrqxKiivZBjbb1MMIlBxBIZa3FY+SJFHGbL/dX5OJVBUuhjyyZWK3L7kUCV4Hr6CzmBS64= 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=hJAUdwIg; arc=none smtp.client-ip=209.85.214.180 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="hJAUdwIg" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-20688fbaeafso42998965ad.0 for <git@vger.kernel.org>; Mon, 09 Sep 2024 07:11:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725891092; x=1726495892; 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=/NxyLI+6aKiOAmHnfYleXx+chC01AB18/i6MEwM7ZL0=; b=hJAUdwIgG373xElHlwfuQfZW5rmJuELt7eCbnzFn+TNmvRLMDcNDG/XBKCy1lwsK/B fKgJIKQ68RNmn2vQsLeGe299J1zVUIvb8UDhM7OoSKcjZjSY/cNcTOXapIMyknKrQoti 0LcDKl8a65F0U3v5p5q3wd52bZezG1Uw2/RZYsmL4SQBE/GVKgAFx1TlSZl5h+hdquYf ui25jqUy8NUoUucUVE0sXMG768rDiCp5RZMbN4iOFpgeELyoYBKFkn07ITjiCS53fiEU cIJev0vgFqGYtzZ+bJFyB8ric4JpfTjItHqVT3zG3COu1WXFNk2dK9WHW8CtKzjebQmz uLog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725891092; x=1726495892; 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=/NxyLI+6aKiOAmHnfYleXx+chC01AB18/i6MEwM7ZL0=; b=NL37tLTDR23cO+FO581LnnLt2A8+V7ujWwllTqnuSi5ukNcLz5HCNHS+Im4A7Rdev2 n54tIH1kJji950svtYAQSKZrl7+wctBg8nkLvstcHCPnwi1D7Oh7k0Xq9H/aFDrgehO6 Mg78echLUIIWm06aXS4rBVXJF/mlr4CluSHClD7nRSgiSuoM/yde3b6dveapjPJ1WWEG +0UbenoowQY5G2izVDRKcAZWpgIRQ2rZOF8x9zodREUEe7PID0py96UZcyE2Y2SjMXpv XDOT6TSMVS85/mz7zi/9M2Ke6rigDO0UUWOF+eI8h/7FWfCqJi7CnPC4ME9mpCykSJfV Wzcw== X-Gm-Message-State: AOJu0YzOCuQIa/yIe4yfu0lEmiLNxe647dHfhz0/dH5EE2aeXuZ1L9Qt Sd+LMG6ck3DO0YQ3MAvEr2zSm5LhOISl6nN3CjcQn7nUMkO4VjzAWN1PyA== X-Google-Smtp-Source: AGHT+IEngev2jPmx56s34kjiHczlatYu5vpyQ2S0sF2vOInBSzZOaSwFq3TqiWu3tRs/KOnzNKlLvw== X-Received: by 2002:a17:902:cec1:b0:205:8407:6321 with SMTP id d9443c01a7336-206f04a01fcmr127636765ad.9.1725891092024; Mon, 09 Sep 2024 07:11:32 -0700 (PDT) Received: from panther.lan ([2607:fa18:92fe:92b::47f]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20710eef1e7sm34251735ad.120.2024.09.09.07.11.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Sep 2024 07:11:31 -0700 (PDT) From: Alex Henrie <alexhenrie24@gmail.com> To: git@vger.kernel.org, gitster@pobox.com, bert.wesarg@googlemail.com Cc: Alex Henrie <alexhenrie24@gmail.com> Subject: [PATCH v2 0/1] apply: support --ours, --theirs, and --union for three-way merges Date: Mon, 9 Sep 2024 08:10:57 -0600 Message-ID: <20240909141109.3102-1-alexhenrie24@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240906044222.4881-1-alexhenrie24@gmail.com> References: <20240906044222.4881-1-alexhenrie24@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: <git.vger.kernel.org> List-Subscribe: <mailto:git+subscribe@vger.kernel.org> List-Unsubscribe: <mailto:git+unsubscribe@vger.kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit |
Series |
apply: support --ours, --theirs, and --union for three-way merges
|
expand
|