Unintentional double commits

[Zero King]

I've created a clean branch on my fork. If you want to clean the 
history, first cancel branch protection in repository's settings, then do

git remote add https://github.com/l2dy/macports-ports.git

git fetch --all

git checkout master

git reset --hard l2dy/fix-history

git push -f

to reset master to my branch and push the cleaned history.


On 12/21/16 10:41 AM, Andrea D'Amore wrote:
> While trying to push a small change (shell/xonsh) I managed to rebase
> AND merge the about 300 commits since my previous update,
> as a results those 300 commits in master now are "duplicated".
>
> The files in master are unaltered, except for the actual portfile I
> was pushing, but the history is now messier.
>
>
> I've been checking on IRC how to address this for last two hours, I
> had the dilemma that force pushing to the commit before mine would
> clean the history but at the same time break workflow for users that
> may already have fetched the changes.
>
> I couldn't get hold of anybody on #macports to double check this so
> I'm not calling the shot since the messier history doesn't actually
> break the workflow.
>
>
> I apologize for the error, I'm really sorry for the confusion and
> noise it will trigger in tickets.
>
>

-- 
Zero King