2017-01-03 20:52 GMT+08:00 Moritz Barsnick <barsn...@gmx.net>: > On Tue, Jan 03, 2017 at 13:38:44 +0100, Bodecs Bela wrote: > > I have technical difficulties to merge them into one commit. I am not a > > git expert. > > This muxers.texi patch is based on my earlier accepted, but yet not > > applied doc patch on this same file. > > I created the related code patch in a different local git branch. Now I > > tried to merge the two local branches into one > > but a terrible result occured when I created a common patch file. > > I usually work on a local branch: feature-soandso.01 > If I want to rearrange the patches, I create a new branch from master: > > $ git checkout master > $ git pull > $ git checkout -b feature-soandso.02 > > then I can e.g. reintegrate those two commits as one: > > $ git cherry-pick --no-commit <hash of first commit from > feature-soandso.01> > $ git cherry-pick --no-commit <hash of second commit from > feature-soandso.01> > $ git commit # don't forget to re-edit the now merged commit messages > > and then I (re-)submit that last commit from this new branch to the > mailing list. > > (Untested, from memory.) Good luck. > > > Is it a problem to remain two seperate patches? > > I don't declare the recommendations on this list, I just interpret > them. ;-) Generally, there's no use in separating the doc from the > feature commit. > > Moritz > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel >
try Moritz's way, and test base the attachement file maybe better.
0001-avformat-hlsenc-size-and-duration-in-segment-filenam.patch
Description: Binary data
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
