Create a gist now

Instantly share code, notes, and snippets.

What would you like to do?
Fixing some erroneous commits in Stringly.
[noahlz:stringly]$ git checkout master
Switched to branch 'master'
[noahlz:stringly]$ git log -6 --oneline
d230ce9 merge branch develop [no ci]
908e62b only build master
0416e6c Added a few words about Perforate to the readme.
621565e only build master
5832d26 Added a few words about Perforate to the readme.
3ca1764 Merge branch 'issues/6/upgrade-perforate'
[noahlz:stringly]$ git reset --soft HEAD~3
[noahlz:stringly]$ git log -1
commit 3ca176419f2c0596aa4bdbe4b9b37cdf2fe3a066
Merge: af161e5 bbd7a54
Author: noahlz <nzucker@gmail.com>
Date: Sat Jul 13 23:51:11 2013 -0400
Merge branch 'issues/6/upgrade-perforate'
[noahlz:stringly]$ git log -5 --oneline
3ca1764 Merge branch 'issues/6/upgrade-perforate'
bbd7a54 Resolves issue #6. Perforate 0.3.3
af161e5 Closes #8 - continous deployment to heroku
288e99e added TODO
0bbe84b pushed broken build to master lol
[noahlz:stringly]$ git status -s
M .travis.yml
M README.md
[noahlz:stringly]$ git diff
[noahlz:stringly]$ git stash
Saved working directory and index state WIP on master: 3ca1764 Merge branch 'issues/6/upgrade-perforate'
HEAD is now at 3ca1764 Merge branch 'issues/6/upgrade-perforate'
[noahlz:stringly]$ git checkout develop
Switched to branch 'develop'
[noahlz:stringly]$ git log -4
commit 1a609cf9b1d4dacd704a700fa392770de2380970
Author: noahlz <nzucker@gmail.com>
Date: Sun Jul 14 17:27:12 2013 -0400
only build master
commit 1a609cf9b1d4dacd704a700fa392770de2380970
Author: noahlz <nzucker@gmail.com>
Date: Sun Jul 14 17:27:12 2013 -0400
only build master
commit 5832d266fbca44f8e942d709382be0165f4fe497
Author: noahlz <nzucker@gmail.com>
Date: Sun Jul 14 17:16:57 2013 -0400
Added a few words about Perforate to the readme.
commit 3ca176419f2c0596aa4bdbe4b9b37cdf2fe3a066
Merge: af161e5 bbd7a54
Author: noahlz <nzucker@gmail.com>
Date: Sat Jul 13 23:51:11 2013 -0400
[noahlz:stringly]$ git checkout master
Switched to branch 'master'
Your branch is behind 'origin/master' by 5 commits, and can be fast-forwarded.
[noahlz:stringly]$ git push origin +master
Total 0 (delta 0), reused 0 (delta 0)
To git@github.com:noahlz/stringly
+ d230ce9...3ca1764 master -> master (forced update)
[noahlz:stringly]$ git branch
develop
* master
[noahlz:stringly]$ git merge --no-ff develop
Merge made by the 'recursive' strategy.
.travis.yml | 3 +++
README.md | 14 ++++++++++++--
2 files changed, 15 insertions(+), 2 deletions(-)
[noahlz:stringly]$ git diff
[noahlz:stringly]$ git log -1
commit 013406653c5e75d32e7bb48e3a2c3829121dfa1a
Merge: 3ca1764 1a609cf
Author: noahlz <nzucker@gmail.com>
Date: Sun Jul 14 18:33:46 2013 -0400
Merge branch 'develop'
[noahlz:stringly]$ git reset --soft HEAD^
[noahlz:stringly]$ git log -1
commit 3ca176419f2c0596aa4bdbe4b9b37cdf2fe3a066
Merge: af161e5 bbd7a54
Author: noahlz <nzucker@gmail.com>
Date: Sat Jul 13 23:51:11 2013 -0400
Merge branch 'issues/6/upgrade-perforate'
[noahlz:stringly]$ git merge --no-ff develop -m"Merge branch 'develop' [skip ci]" .
fatal: '.' does not point to a commit
[noahlz:stringly]$ git merge --no-ff develop -m"Merge branch 'develop' [skip ci]"
Merge made by the 'recursive' strategy.
.travis.yml | 3 +++
README.md | 14 ++++++++++++--
2 files changed, 15 insertions(+), 2 deletions(-)
[noahlz:stringly]$ git log -1
commit 207037371c1d53424aa260a224f0f5edfa4c6d2d
Merge: 3ca1764 1a609cf
Author: noahlz <nzucker@gmail.com>
Date: Sun Jul 14 18:34:45 2013 -0400
Merge branch 'develop' [skip ci]
[noahlz:stringly]$ git push
Counting objects: 1, done.
Writing objects: 100% (1/1), 229 bytes, done.
Total 1 (delta 0), reused 0 (delta 0)
To git@github.com:noahlz/stringly
3ca1764..2070373 master -> master
[noahlz:stringly]$
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment