Skip to main content

Git commands cheat sheet (in progress)

### Use case: Working on 2 dev branches and merging one into the other and want to revert
git checkout dev_branch
git merge my_new_feature // merging my branch into develop
Ooops, now I realized `my_new_feature` has something wrong

git revert -m 1 <sha of merged commit> 
OR
git revert HEAD
-m 1 means we keep the parent side of merge (dev_branch branch)

### Fetch their new commits and merge to your branch
git fetch protected_repo


Committed but not pushed to remote. Want to get rid of latest commit
git reset --hard HEAD~1
Get a branch from a forked repo to your own repo (or to your own forked repo)
git reset HEAD~1 

Get a branch from a forked repo to your own repo (or to your own forked repo)


git fetch git@github.com:theirusername/reponame.git theirbranch:ournameforbranch
Associate your local copy to the upstream branch
git remote add repo_name https://github.com/theirusername/their_repo.git


Fetch their new commits and merge to your branch
git fetch protected_repo
git merge protected_repo/foo

Comments

Popular posts from this blog

HTML5 Dev Conf and IOTAConf

Next week is going to be really fun. I have the opportunity to attend the HTML5DevConf and IOTAConf again and also go to a new conference hosted by Twitter: Twitter Flight Here's the schedule of the talks I intend to go for the HTML5DevConf: http://www.iotaconf.com/schedule.html http://html5devconf.com/schedule.html Monday: 7:30-9:00 Registration 9:00-9:50 1. The Web of things - Leveraging the web for the internet of things, E-135 2. Design patterns for an internet of things, N-123 3. Dump SASS and Less CSS for JS powered CSS, Michael Mikowski, Qualaroo, E-131 10-10:40 Break 10-40-11:30 1. How to create native-like experience in the mobile web, E-131 2. Bringing Web content to the big screen with google cast, E-130 11:40-12:30 1. Virtual Reality & the future of the web, E-135 2. The new meteor platform, web and native mobile from a single reactive javascript codebase, E-133 1:30-2:20 1. Engaging Apps: Service Workers, Push an

Run python inside python and capture output

This is taken from http://techkr.blogspot.com/2007/02/python-how-to-get-output-from-ossystem.html: How to execute python inside python and capture output: A quick solution using popen : import os result=os.popen('command').read() print result where command is your command (expl. on windows: dir,ipconfig,...) If you expect more than a line and want each word in a list: import os,string result=string.split(os.popen('dir/w').read())