Git Cheat Sheet

A few months back we migrated from svn to git at office. If there is one thing I regret in my work at Justeat.in, it is why did I not move to git earlier. The move significantly reduced our time to resolve conflicts and release code to production. I will talk about my experiences with git in a different post. I have commited most used commands to memory. In here, I am documenting some of the other commands which I keep looking up once in a while.

###bash Git Cheat Sheet
#List all local and remote branches
    git branch -a
#List all remote branches
    git  branch -r
#List all local branches
    git branch
#Delete local branches
    git branch -d <branch name>
#Checkout a remote branch and track it
    git checkout -b <remote branch name>
#Show the remote root
    git remote show
#Show the mapping between local and remote branches
    git remote show origin
#Set global value
    git config –global user.name “Ramjee Ganti”
    git config –global user.email <email address>
    git config –global core.mergetool meld
    git config –global core.difftool meld
    git config –global core.editor vim
    git config –global color.ui true
#Set project specific value
    git config user.name “Ramjee Ganti”
    git config user.email 
#Set global alias
    git config –global alias.st status
#Set project specific alias
    git config alias.st status
#Show all git operations performed
    git reflog
#Revert to particular commit in past
    git reset –hard <commit>
#Revert changes to a staged file
    git checkout – <file name>
#Commit without invoking pre commit hooks
    git commit –no-verify
#Push a branch to a remote server
    git push origin <branch name>
#Delete a branch from remote server
    git push –delete origin <branch name>
#Configure an upstream repository.(1)
    git remote add upstream git://upstream.url.here
    git fetch upstream
#Change the remote repository
    git remote set-url origin git://new.url.here
#Git Alias to list tags using along with tag
git config –global alias.tag-date “for-each-ref –sort=’*authordate’ –format=‘%(taggerdate) %(tag)’ refs/tag”

(1): When a repository is cloned, it has a default remote called origin that points to your fork on remote repository, not the original repository it was forked from. To keep track of the original repository, you need to add another remote named upstream.