[FFmpeg-devel] [GIT] ready by the weekend
Thu Nov 18 10:50:43 CET 2010
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.
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?
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Size: 198 bytes
Desc: Digital signature
More information about the ffmpeg-devel