Message ID | 20200625121953.16991-1-alban.gruin@gmail.com (mailing list archive) |
---|---|
Headers | show
Return-Path: <SRS0=4a08=AG=vger.kernel.org=git-owner@kernel.org> Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BA0E06C1 for <patchwork-git@patchwork.kernel.org>; Thu, 25 Jun 2020 12:48:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9A347206BE for <patchwork-git@patchwork.kernel.org>; Thu, 25 Jun 2020 12:48:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gZsHkdMG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404755AbgFYMsz (ORCPT <rfc822;patchwork-git@patchwork.kernel.org>); Thu, 25 Jun 2020 08:48:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59280 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404125AbgFYMsy (ORCPT <rfc822;git@vger.kernel.org>); Thu, 25 Jun 2020 08:48:54 -0400 Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 70969C061573 for <git@vger.kernel.org>; Thu, 25 Jun 2020 05:48:54 -0700 (PDT) Received: by mail-wm1-x341.google.com with SMTP id l17so5443521wmj.0 for <git@vger.kernel.org>; Thu, 25 Jun 2020 05:48:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ehfE815IBEpAx1moyrDX8v7+InrqFLgsWlaU694vpSI=; b=gZsHkdMGS/NhpKmrYtOozjPT9ifJlnYMYW6o6+u98HlnjyaNbOcBAbAg76sqZz7oXE 13OJXRDkZg0wLJQ5t4Q6WFY5ts58HlQskGj1r4pAhxq28t9TUcHzIHZ+sCTPlGOf2aND /hkQK7yEbmFOW2U74rTEliWq+ruE2Mye9IU1XSUz+5iT1CJmAmg41gXGNbfy+IlPkCpl OuYKlWwqCxilx6wBqWBdE2IYxB/hNFSHQa02rJm393t1Mmm+bOusVfcshaW4xpCmQoGn yN3pIaTDaJga0OdBKkXJw6aYnHdjDXoFRQgVKFWSyB9BSwxsjrsWTQ0A83MhIhWTXD2+ 8EmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ehfE815IBEpAx1moyrDX8v7+InrqFLgsWlaU694vpSI=; b=n5Xtfx0F/0KtPE8279yuYyGBgjkBwZbOX+JGwwCAG3bfkx/OAtBogKBbtgL20sPR4f rSFkzaVcPelW8nvGDpBI3feobFsyLO/HOji4fvANPuLwVUH841kiWUtJAFFqjXblWXQW KvgmQJurM+bNs8wAyZvCgxLwj4qydVXlqHRLWUBEUcR+HVOil0qyndifSu9cylCGMwkb 4Ea2vtfQ5OTCcCTrYejN+36itly/Pg/6WR8EFQJZiwJj3ihOmsBHpGTPKWTW0cm32wao wxqlHAVVYyMJc+g6YnduDOet9i/sfFSIphl2Kz6KpIQJiiI4eJUDFgPOTUmnWa4Yz6vx 3z6Q== X-Gm-Message-State: AOAM531Vc7n4evRbSf9sybpsPXrjCo3aEP/FOREeiNHawRUdrWI2a+tZ MXSHbEiL5t3NgWMldEK0GifN0K48 X-Google-Smtp-Source: ABdhPJwofXLAOw/oAjurTHUQcgaIrHWDDGKdORoMzRoF4YYyRx2iIo9v22XAEVDE+Z2qEPE78jB08A== X-Received: by 2002:a1c:7c15:: with SMTP id x21mr3008377wmc.146.1593089332716; Thu, 25 Jun 2020 05:48:52 -0700 (PDT) Received: from ylate.lan (atoulouse-654-1-308-216.w86-199.abo.wanadoo.fr. [86.199.91.216]) by smtp.googlemail.com with ESMTPSA id y16sm31563409wro.71.2020.06.25.05.48.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jun 2020 05:48:52 -0700 (PDT) From: Alban Gruin <alban.gruin@gmail.com> To: git@vger.kernel.org Cc: Junio C Hamano <gitster@pobox.com>, Alban Gruin <alban.gruin@gmail.com> Subject: [RFC PATCH v1 00/17] Rewrite the remaining merge strategies from shell to C Date: Thu, 25 Jun 2020 14:19:36 +0200 Message-Id: <20200625121953.16991-1-alban.gruin@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: <git.vger.kernel.org> X-Mailing-List: git@vger.kernel.org |
Series |
Rewrite the remaining merge strategies from shell to C
|
expand
|