[PATCH] Hook up colour printing with print dialog.

[Dirk Hohndel]

Amit Chaudhuri <amit.k.chaudhuri at gmail.com> writes:

> Hi,
>
> I've just sent two patches by separate mail.  Together they repeat what was
> sent the other day and then amend to change grid colour, default for
> printing and spelling.
>
> Question: is this the accepted way to package an amendment to a patch, or
> is it usual to force git to roll the multiple steps into a single
> patch? 

It's a matter of taste and style. If the first patch breaks compiles or
makes bisecting potentially hard for a reason (and if it has not been
pushed out to an external repo, yet) then it is often better to roll
this into a single patch. Or if it contains things that are completely
bogus... 

I personally dislike patch series that introduce a bug and then fix it
later in the series - that's just bad (but especially if I push things
out too aggressively that often happens).

> If so, how can that be done?

git commit -s -a --amend

This takes all the changes in your tree and adds them to the last commit

or, if you already committed both

git rebase -i HEAD~2

this opens an editor with the last two commits in it. You can then
select the second commit and change 'pick' into 'squash' and the two
commits will be combined... more on that here

http://git-scm.com/book/en/Git-Tools-Rewriting-History#Changing-Multiple-Commit-Messages

And this is something that I can do after applying your emailed patches,
too (which is what I'll do with the two that you sent earlier - no
reason to resend).

/D