From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Hudec Subject: Re: how to create v2 patch Date: Thu, 6 Dec 2007 21:44:05 +0100 Message-ID: <20071206204405.GA4216@efreet.light.src> References: <47515693.9070405@imap.cc> <47515EF3.8010507@obry.net> <20071201134321.GA10997@glandium.org> <475855D6.201@imap.cc> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Mike Hommey , Pascal Obry , git@vger.kernel.org To: Tilman Schmidt X-From: git-owner@vger.kernel.org Thu Dec 06 21:47:35 2007 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1J0Nd7-0003qD-Fy for gcvg-git-2@gmane.org; Thu, 06 Dec 2007 21:47:33 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752129AbXLFUrL convert rfc822-to-quoted-printable (ORCPT ); Thu, 6 Dec 2007 15:47:11 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752088AbXLFUrK (ORCPT ); Thu, 6 Dec 2007 15:47:10 -0500 Received: from ns1.bluetone.cz ([212.158.128.13]:40360 "EHLO ns1.bluetone.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751943AbXLFUrJ (ORCPT ); Thu, 6 Dec 2007 15:47:09 -0500 Received: from localhost (spamhole.bluetone.cz [192.168.13.2]) by ns1.bluetone.cz (Postfix) with ESMTP id 227CC57578; Thu, 6 Dec 2007 21:47:08 +0100 (CET) Received: from ns1.bluetone.cz ([192.168.13.1]) by localhost (spamhole.bluetone.cz [192.168.13.2]) (amavisd-new, port 10026) with ESMTP id 4fbpneOBkvX8; Thu, 6 Dec 2007 21:47:05 +0100 (CET) Received: from efreet.light.src (145-119-207-85.strcechy.adsl-llu.static.bluetone.cz [85.207.119.145]) by ns1.bluetone.cz (Postfix) with ESMTP id EF22B57588; Thu, 6 Dec 2007 21:47:04 +0100 (CET) Received: from bulb by efreet.light.src with local (Exim 4.68) (envelope-from ) id 1J0NZm-00016y-2T; Thu, 06 Dec 2007 21:44:06 +0100 Content-Disposition: inline In-Reply-To: <475855D6.201@imap.cc> User-Agent: Mutt/1.5.17 (2007-11-01) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On Thu, Dec 06, 2007 at 21:04:38 +0100, Tilman Schmidt wrote: > Am 01.12.2007 14:43 schrieb Mike Hommey: > > On Sat, Dec 01, 2007 at 02:17:39PM +0100, Pascal Obry wrote: > >> Tilman Schmidt a =C3=A9crit : > >>> I have produced a patch, submitted it to LKML, received a few > >>> comments, committed appropriate changes to my local git tree, > >>> and now want to submit a revised patch. How do I do that? > >>> If I just run git-format-patch again, it produces my original > >>> patch plus a second one containing my updates, but what I need > >>> is a single new patch replacing the first one. > >> Can't you merge both of your changes in your local repository? I w= ould > >> do that with an interactive rebase. > >=20 > > Or just git commit --amend when committing. >=20 > Hmm. But wouldn't each of these approaches lead to my original > commit being removed from my git repository? And isn't removing > commits that have already been published strongly discouraged? Removing commits that you already published is strongly discouraged. Bu= t patch is not a commit. A v2 (short for 'second version') patch means a = patch, that should be applied /instead/ of the previous. The previous patch --= and the commit it was generated from as well as any commit generated by app= lying it -- should indeed be replaced by the new version. --=20 Jan 'Bulb' Hudec