[FFmpeg-devel] [PATCH] avoid sourcefile inclusion (vis and mlib in swscale)

[Reimar Döffinger]

Hello,
On Mon, May 05, 2008 at 12:08:12PM +0200, Diego Biurrun wrote:
> Also, I fear that if everybody starts using git (in this way), our
> history will soon look like
[... lots of "useless" commits]

That reminds me, does someone know of good ways to merge patches or
modify the history in git?
I guess it should work quite well by building a new branch with
git-commit --amend and git-rebase and such, but I never did it myself
and it does not exactly seem like a quick and easy way.
git-stash can also help in avoiding such a mess in the first place
though.
Maybe it is time to add to the policy that patch series from a
developer's local repository might need cleaning up and removing
commits that are not really worth of having the history for.

Greetings,
Reimar D?ffinger