2012/12/26 Felipe Sateler <[email protected]>: > On Wed, Dec 26, 2012 at 3:09 PM, Dan S <[email protected]> wrote: >> 2012/12/26 Felipe Sateler <[email protected]>: >>> On Wed, Dec 26, 2012 at 7:19 AM, Dan S <[email protected]> wrote: >>>> 2012/12/25 Felipe Sateler <[email protected]>: >>>>> On Thu, Dec 20, 2012 at 5:12 PM, >>>>> <[email protected]> wrote: >>>>>> >>>>>> The following commit has been merged in the master branch: >>>>>> commit b058aafc3bfcd2b94317654ff3306700f558c61b >>>>>> Author: Dan Stowell <[email protected]> >>>>>> Date: Thu Dec 20 19:29:29 2012 +0000 >>>>>> >>>>>> Imported Upstream version 3.6.1~repack >>>>> >>>>> It seems this is not a merge from the upstream branch. >>>>> >>>>> This can be fixed, but the history would be rewritten and clones would >>>>> break. I think it is worth it, though. >> >> (Rewriting the history is fine by me btw) > > OK, you can do this as follows (I don't think I'll get access to my > usual computer this week): > > git rebase -i some-commit-before-the-bad-non-merge > # Select to edit the previous commit to the non-merge, and delete the > non-merge > # When git drops you in a shell to edit the command, do > git merge upstream/3.6.1_repack > git rebase --continue > > > This should leave you the correct history.
Thanks, this works for me locally - but I am not allowed to push non-fast-forward to the remote server (as far as I know) Best Dan _______________________________________________ pkg-multimedia-maintainers mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
