Le 28 février 2012 00:35, Adam C Powell IV a écrit : > Hello, > > On Mon, 2012-02-27 at 15:45 +0100, D. Barbier wrote: >> Le 27 février 2012 15:24, Adam C Powell IV <hazel...@debian.org> a écrit : >> > On Sun, 2012-02-26 at 08:54 -0500, Adam C Powell IV wrote: >> > [snip] >> > There are a couple of issues in the git repository though. I >> > accidentally merged pristine-tar into Debian on January 8, and am not >> > sure how to un-merge it, though was able to build in spite of it, sorry >> > about that! >> >> Hello Adam, >> >> Try: >> $ git rebase --onto fd53673 9a7eb41 debian >> $ git diff HEAD origin/debian >> $ >> >> You will have to use the --force command-line flag of git push in >> order to upload this new head. > > Great, I think this worked.
Hello, No, your branch still merges pristine-tar. I just uploaded a 'debian-fixed' branch to show how it should look like. It is identical to your 'debian' branch and also 'debian/0.9.1-1' tag, but its history is clean. Denis -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
