Re: [gthumb-list] a second patch

["Dr. Michael J. Chudobiak" <mjc avtechpulse com>]

On 06/11/2009 05:25 PM, don Paolo Benvenuto wrote:
> I've submitted a first patch, and now I have another ready, but if I
> make "git diff", the first patch is included too.
>
> How do I generate a patch of the second change only?
>
> thank you!


1. Do first batch of changes.
2. Run "git diff > patch1.patch"
3. Run "git commit -a"
4. Do second batch of changes.
5. Run "git diff > patch2.patch"
6. Run "git commit -a"

The "git commit -a" part is probably what you were missing.

Alternatively, I think you can do:

1. Do first batch of changes.
2. Run "git commit -a"
3. Do second batch of changes.
4. Run "git diff > patch2.patch"
5. Run "git format-patch origin"

This will generate two patch files (one for each commit).

This is helpful for explaining git:

http://ktown.kde.org/~zrusin/git/git-cheat-sheet-medium.png


- Mike