Quoting Felipe Sateler (2013-06-07 18:43:53) > On Fri, Jun 7, 2013 at 12:21 PM, Sebastian Ramacher > <[email protected]> wrote: > > On 2013-06-07 12:10:44, Felipe Sateler wrote: > >> On Fri, Jun 7, 2013 at 11:06 AM, Sebastian Ramacher > >> <[email protected]> wrote: > >> > Huch, which serious headache? I didn't rewrite any history. Maybe > >> > me choice of words was unfortunate. I didn't rebase it in a git > >> > rebase sense. > >> > >> > >> It seems to me you did, but you didn't rewrite history because then > >> you merged the pre-rebase with the post-rebase. Is that correct? > > > > 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 > > > > > 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.
I perfectly agree with both of you (now that I think I understand it) :-) - Jonas -- * Jonas Smedegaard - idealist & Internet-arkitekt * Tlf.: +45 40843136 Website: http://dr.jones.dk/ [x] quote me freely [ ] ask before reusing [ ] keep private
signature.asc
Description: signature
_______________________________________________ pkg-multimedia-maintainers mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
