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 | | : :' : [email protected] | | `. `' Debian user, admin, and developer | | `- http://www.debian.org | -----------------------------------------------------------------
signature.asc
Description: Digital signature
_______________________________________________ Pkg-clamav-devel mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-clamav-devel
