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

[Måns Rullgård]

Reimar D?ffinger <Reimar.Doeffinger at stud.uni-karlsruhe.de> writes:

> Hello,
> On Sun, Aug 05, 2007 at 05:26:37PM +0200, Michael Niedermayer wrote:
>> On Sun, Aug 05, 2007 at 02:14:26PM +0200, Reimar D?ffinger wrote:
>> > On Sun, Aug 05, 2007 at 02:11:09PM +0200, reimar wrote:
>> > > Author: reimar
>> > > Date: Sun Aug  5 14:11:09 2007
>> > > New Revision: 9933
>> > > 
>> > > Log:
>> > > First version of xsub decoder, not yet tested
>> > 
>> > I just pushed my git-history as it was, I hope I am right that this is
>> > the preferred way of doing it although it means quite a lot of emails
>> > and some slightly broken revisions in-between.
>> 
>> yes but you should not commit broken revissions to your git repo in the
>> first place IMHO
>
> 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.

-- 
M?ns Rullg?rd
mans at mansr.com