Git Cheat Sheet

Most common git commands / tricks / tips - concentrating on those that I have actually used (instead of trying to cover all commands).

Config commands

git config --global user.name <username>
git config --global user.email <email>
git config --global color.ui true

# shortcut aliases
git config --global alias.cm "commit -m" # git cm "commit message"
git config --global alias.st "status"    # git st === git status

# clone a repo
git clone <repo path> <folder name>

# adding a remote
git remote add <alias> <url>

Commonly used commands

# stage files
git add <file paths>
git add .   # current directory and all subdirs

# unstage files
git reset <file paths>
git reset # all staged files will be unstaged

# diff files
git diff <file path>
git diff --staged

# commit
git commit -m"message"
git commit --amend -m "Updated message for the previous commit"

# push to remote
git push <remote> <branch>

# pull changes and merge
git fetch <remote>
git merge <remote>/<branch>
git merge --abort

# rollback last commit - creates a new commit to undo last change
git revert HEAD

# create new branch
git checkout <branch>

# delete branch
git branch -d <branch>

# delete branch in remote
git push origin --delete <branch>

Moderately used commands

# show whats different in A wrt B
git diff branchB..branchA

# show commits in A which are not in B
git log branchB..branchA

# delete file
git rm <file>

# move or rename file
git mv <current_path> <new_path>

# Save modified and staged changes
git stash

# list stack-order of stashed file changes
git stash list

# write working from top of stash stack
git stash pop

# discard the changes from top of stash stack
git stash drop

Less commonly used commands

# rebase
git rebase <branch>

# clear staging and checkout commit
git reset --hard <commit>

Comments