cURL / Mailing Lists / curl-library / Single Mail


Using git to regenerate patches (was Re: [PATCH 1/7] Comment and debug output fixes.)

From: Daniel Stenberg <>
Date: Mon, 10 Nov 2014 09:47:25 +0100 (CET)

On Sun, 9 Nov 2014, Carlo Wood wrote:

> do you want me to generate a new diff (which isn't a natural way to use
> git-- and therefore not very trivial :/).

(Slightly off-topic but I figured we can take this little detour for the
greater good.)

It is indeed a natural way to use git and it is trivial to do.

An easy way is to just commit the fix in the local branch where you do your
patch series, and then 'git rebase -i' and move the fix next to the one one
being fixed and mark it as 'fixup'. Done.

There's also the rebase --autosquash and commit --fixup ways, but I personally
prefer the more manual method since it gives me (the sense of) greater

When generating new diffs from the same patch series, I like to use git
format-patch's -v option to make it visible they're another reroll.

List admin:
Received on 2014-11-10