On 2013-06-07 12:43:53, Felipe Sateler wrote: > > I exported the relevant commits from master [1], applied them on top > > missing-commits, merged master into missing commits with -s ours to get > > rid of the noise and merged missing-commits into master. If that's > > something git rebase can do for me, please let me know so that I can > > learn something new about git rebase. > > > I think it can. If we define a new branch torebase as commit 1598404a > (ie, the last commit before the missing revision import), I think the > following should have the same effect as what you did: > > git checkout torebase > git rebase missing-commits > git merge master -s ours
Cool, thank you! This will make it easier if I have to do something like that again. > > > > If you have something more specific in mind to get this sorted, please > > be more verbose because I can't seem to understand what you guys prefer. > > This is OK with me, as no local clones will have to force updates. Good, I'll push it then. Regards -- Sebastian Ramacher
signature.asc
Description: Digital signature
_______________________________________________ pkg-multimedia-maintainers mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
