sandiegopython / intro-to-python

Introduction to Python (2014)
Creative Commons Attribution 4.0 International
28 stars 26 forks source link

Fix commit history #46

Closed willingc closed 10 years ago

willingc commented 10 years ago

If anyone would be willing to fix my revert mess, I would be most appreciative.

I would like to roll back to this commit 3ef06df1909d30001ea7f0dbe4e9e1aefd85b2f3

Thanks @treyhunner, @macro1 ???

treyhunner commented 10 years ago

I reset master to 3ef06df1909d30001ea7f0dbe4e9e1aefd85b2f3 and made a branch old-master that points to where master was at (in case you need to undo my resetting):

$ git checkout master
$ git pull
$ git checkout -b old-master
$ git push -u origin HEAD
$ git checkout master
$ git reset --hard 3ef06df
$ git push --force
treyhunner commented 10 years ago

It looks like pull request #45 was merged after that commit. I'm going to put master back to where it was because it looks lie you reverted that commit. Hopefully you already had it where you wanted it. We can rewrite history later if we need to.

macro1 commented 10 years ago

http://justinhileman.info/article/git-pretty/git-pretty.png

So the relevant question is "Are there enough people to form a lynch mob?" In general I leave it alone if it makes it to master.

willingc commented 10 years ago

Thanks @treyhunner and @macro1. @macro1, from now on, I will send you all of my git questions ;)

macro1 commented 10 years ago

Oh dear.