Quick reference for some frequently used Git commands.
Set up a new repository
git init
git pull https://github.com/registercosmo/Cheatsheet.git
git remote add origin https://github.com/registercosmo/Cheatsheet.git
git add .
git status
git commit
git commit -m "comments"
git push -u origin master
Sync with the remote repository
# To pull changes to workspace (= fetch + merge)
git pull origin master
# To fetch lastest changes from other developers to local repo
git fetch <remote_name>
# To merge the local repo and the workspace
git merge origin master
Fix the previous commit
git commit --amend
Undo changes
# unstage changes but keep the local changes in the working space
git reset HEAD
# discard all the changes in the stage and working space
# and match the working space the commit B
git reset --hard B
# move the HEAD to commit B, no modification will be made
# to the stage and the working space
git reset --soft B
Untrack files
git rm --cached <file_name>
Set up remote repository
# set up a new remote repo (origin)
git remote add origin <new repo url>
# change URL for a remote repo (origin)
git remote set-url origin <new repo url>
# list all the remote repositories URLs
git remote -v
About configs
# configs for all repositories
git config --global user.name # check current global user.name
git config --global user.name <My username> # set global user.name
git config --global user.email # check current global user.email
git config --gloabl user.email=myemail@example.com # set global user.name
# configs for the current local repository
git config user.name # check current local user.name
git config user.name <My username> # set local user.name
git config user.email # check current local user.email
git config user.email=myemail@example.com # set local user.name
# list all the configs
git config --list
# Remove the configs
git config --global --unset-all user.name # global
# Change the configs
git config --global --replace-all user.name <New User Name> # global
About branches
# fetch remote branches from Github
git remote add origin <ULR> # we have to set origin first
git pull # it will pull(fetch + merge) all available branches from repositories
# check info for all available branches
git branch
# create a new branch
git branch <new_branch_name>
# switch to a specific branch
git checkout <new_branch_name>
# create and switch to a new branch
git checkout -b <new_branch_name>
# check the current branch
git status
# rename a branch
git branch -m <old_branch_name> <new_branch_name>
# merge a specific branch to the current branch
git merge <another_branch_name>
# delete a branch locally
git branch -d <branch_name>
# delete a branch remotely
git push origin :<branch_name>
About diff
# inspect all the modifications between workspace and stage
git diff
# inspect all the modifications between stage and local repo
git diff --cached
About resolving conflicts
git add <resolved file>
Advanced topics
# get the SHA-1 key for a specific contents
echo 'test content' | git hash-object -w --stdin
# get the content of a SHA-1 key
git cat-file -p <key>
# get a object type for a SHA-1 key
git cat-file -t <key>
