[Pkg-clamav-devel] Packaging clamav 0.96

[Stephen Gran]

This one time, at band camp, Michael Tautschnig said:
> My git knowledge seems terribly limited in this regard - I had been doing
> exactly what was in the receipe I had posted and apparently got squashed
> commits; Alberto, at which steps did you deviate? I guess you did the git merge
> with --no-squash!?

Don't worry, yours were done unsquashed as well :)

The difference is actually in git merge, I think.  If I am remembering
my git fu correctly, something like git merge --squash, followed by
git commit, should do the right thing here.  It should produce a single,
large commit by <committer> with all the upstream diffs merged into a
single changeset, rather than a lot of small changes, each by the
upstream authors.

Cheers,
-- 
 -----------------------------------------------------------------
|   ,''`.                                            Stephen Gran |
|  : :' :                                        sgran at debian.org |
|  `. `'                        Debian user, admin, and developer |
|    `-                                     http://www.debian.org |
 -----------------------------------------------------------------
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-clamav-devel/attachments/20100405/f4608277/attachment.pgp>