[FFmpeg-cvslog] r9933 - in trunk/libavcodec: Makefile allcodecs.c allcodecs.h avcodec.h xsubdec.c

[Uoti Urpala]

On Sun, 2007-08-05 at 23:23 +0100, M?ns Rullg?rd wrote:
> Reimar D?ffinger <Reimar.Doeffinger at stud.uni-karlsruhe.de> writes:
> > Well, I can't know without testing first, and sometimes I have to work
> > on some other stuff/branch before everything is there to test, and for
> > switching to a different branch the only sane approach is to commit it.
> > I do of course not usually commit stuff that I know is broken though
> > (but only by the time I commit it to ffmpeg I know it is broken).
> 
> With git it's easy to create a cleaned-up history in a new branch
> before pushing the changes.  Look at cherrypick and commit --amend if
> you've not already done so.

If you do a temporary local commit just because you want to work on
something different you can easily undo it when you continue working on
that branch again. You can either use git-reset to remove the commit
after returning to the branch or create the next commit with "git commit
--amend" to replace the temporary one. That's simpler than a separate
cleanup step in a new branch later.