[FFmpeg-devel] [GIT] ready by the weekend

[Alexander Strange]

On Nov 18, 2010, at 4:50 AM, Nicolas George wrote:

> Le septidi 27 brumaire, an CCXIX, compn a ?crit :
>> what is the correct way to commit?
> 
> This one is hard: what is the correct way to commit when you have yourself
> worked in a git branch?
> 
> With SVN, it was easy: generate a patch using git diff, apply it to a SVN
> checkout, commit. Or, possibly, have a dual git/SVN work tree, checkout the
> git branch, commit to SVN.

git format-patch, hopefully, not git diff.

> 
> With Git, the obvious way to commit is probably something like: git checkout
> master + git merge branch + git push. But this will push the entire branch
> history to the master branch, with every stupid mistake that was corrected
> during the review process. Do we want that?

Git makes it very easy to rewrite your local patches using rebase and amending. We don't accept unclean SVN commits, so we can require clean git history just as well. It's not a problem.

> 
> Regards,
> 
> -- 
>  Nicolas George
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at mplayerhq.hu
> https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-devel