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

Chrome dev tools - secret weapon?

When I started working back in 2010, we used to support IE7. I still remember how much of a paint it was to debug javascript code. With IE8/IE9 debuggers, what I learned is patience, rather than figuring out how to fix all those weird bugs that *always show up *only in IE. The debuggers were so slow. Also back then, firebug was the norm. Chrome dev tools was relatively new and most people I knew did not use it. I liked Chrome so I sticked with it. Now, it's a tool that I use almost every day. In fact, I try to spend some time and follow what's new with the dev tools. I also spend some time experimenting with soon to be features/apis on Chrome Canary. This year, well last year... (2016), I've been pretty busy and haven't had much time to look at the new features. But today, I spent a few hours catching up on the last Google I/O and watch what's new with the dev tools. I wanted to share this link and give back some love to the chrome dev tools by writing this post.

converting videos with ffmpeg

I had to work on some video conversion and I found a good post from the Linux Journal on commands and tips for converting videos. http://www.linuxjournal.com/article/8517 A command example: ffmpeg -i eSeetrackFlash.flv -b 20000k -s 896x536 target_0.7.avi explanation to be continued