From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754493AbbLLB1W (ORCPT ); Fri, 11 Dec 2015 20:27:22 -0500 Received: from outbound.smtp.vt.edu ([198.82.183.121]:54776 "EHLO omr1.cc.vt.edu" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753842AbbLLB1U (ORCPT ); Fri, 11 Dec 2015 20:27:20 -0500 X-Mailer: exmh version 2.8.0 04/21/2012 with nmh-1.6+dev To: linux-kernel@vger.kernel.org Subject: Stupid git question... From: Valdis Kletnieks Mime-Version: 1.0 Content-Type: multipart/signed; boundary="==_Exmh_1449883634_2509P"; micalg=pgp-sha1; protocol="application/pgp-signature" Content-Transfer-Encoding: 7bit Date: Fri, 11 Dec 2015 20:27:14 -0500 Message-ID: <45406.1449883634@turing-police.cc.vt.edu> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --==_Exmh_1449883634_2509P Content-Type: text/plain; charset=us-ascii OK.. Here's the situation - I've got several sets of patches I'll probably be cooking over the holidays, and I'm planning to base on linux-next (though any other moving-target base has the same issues). What I *want* to accomplish: At any given point, linux-next may or may not have breakages that cause me grief (anything from compile issues to can't-boot-to-multiuser crashes). What's the *clean* way to accomplish the following: git branch --track linux-next/master local-fixes git branch --track local-fixes project-1 git branch --track local-fixes project-2 git branch --track local-fixes project-3 Basically, have some way to keep track of the small integer number of local things that I don't want escaping if I do a 'git format-patch project-2' or other similar thing, and so I only have to deal with doing the local fix once. Just dropping commits on top of linux-next doesn't seem right, as it could get ugly the next 'git remote update'. What are maintainers doing to deal with similar issues, where you need to make sure that your test builds in fact contain unrelated commits needed for the build to be testable? --==_Exmh_1449883634_2509P Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 Comment: Exmh version 2.5 07/13/2001 iQIVAwUBVmt38gdmEQWDXROgAQLl4xAAgZkuyZImUfT77cC0XXN+D/B+ByguRlsq oik1hdi55rgcRfcYx/mmJzH/+GnM9BN7DL+hPaCZN44cT06/lgb4w6/OZz6sGCX9 02P/Wl9E75wy+2Y3XMfnMSANTbmGBaEC+JK1/gFiiZVqgZFtKuyejEK6ZYirxuMG Xj1QDKRi2Q811YQoThJz4pg155MI+U+HX6EX2oP/P69c92AbrM+/hm9grFNaCMxr W9rgZfeEvMROTDH+teApLIz8CiH/7bDKQ3V6lPnORK8AGokZx3CuPYfSgxf8IjjL 04YIzPq4DoemU31mxSrL64kbHjPIUVcaN0n0HZqOZ/ys5qDuqU51oIaiut7xXbQQ cp3jC6MLgw5iI2G24sO2kZ8k7B/6uR75EPdkG9/JxVsKrsV4fK0Wl8D7VL4NgNmD GB59voIZUBQZqRC0SgYy8yDoStszrFjAyUg96/1zGZSFT0rIRdWAhrTaSrPV3DD2 zygMYMhlZ+ghXp+5fsFpj/pCxK8RyEqUoFQLW70Xk9rGb7gJZKaJGWOL0P46vpuI 4UB553ewNyDJNUMaUb9TonH8fOjTxEUZ6rE6Q2GoAy96cmQT3A4INxY9+R6weJ6T DcoSFFkRTMJnLzeF7afT46VdZ1pBcJFqLSR5BSUnEPymbQkGt8aH1MUd2qGPcKMn GJ32GzM8+RI= =GZXS -----END PGP SIGNATURE----- --==_Exmh_1449883634_2509P--