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 écrit : > >>> 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 would > >> do that with an interactive rebase. > > > > Or just git commit --amend when committing. > > 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. But 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 applying it -- should indeed be replaced by the new version. -- Jan 'Bulb' Hudec <bulb@xxxxxx> - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
