git init              # initiate a git repository inside the current project

git add .             # add all files in the working directory to the staging area

git commit -m "message"    # commit all the files in the staging area           

git commit -a -m "message"     # this combines adding all TRACKED files to the 
                               # staging area and committing them       

git rm                        # remove a file from the Index and from disk
                              # might need -f flag, if file has been changed
                              
git rm --cached               # remove a file only from the staging area/index,
                              # not from disk

git add -A                    # add everything in the working directory, including 
                              # deletion of files, to the staging area

git add -p                    # Add patches of code individually 
                              # ("Stage this hunk [y,n,q,a,d,/,e,?]?")

git status                    # show staged, tracked and untracked files

# Also consider starting a .gitignore file, or perhaps you have a default .gitignore 
# file ready

git log --oneline     # info on each commit abbreviated to one line

git log -n 4          # display only the last 4 commits

git log --all --graph --decorate --oneline      # nice graphical display of all 
                                                # branches and their heads
                                                # put it in an alias!

git diff                 # show what's in WORKING DIRECTORY compared to INDEX

git diff --cached        # what's in INDEX compared to HEAD

git diff HEAD            # what's in WORKING DIRECTORY + INDEX compared to HEAD

git diff HEAD~3..HEAD   # shows diffs that are in the right hand commit 
                         # compared to the commit on the left

git reset --soft HEAD^     # leaves the working directory and Index as it is
                           # but sets HEAD back by one commit

# If you want to correct your last commit you can also do this:
git commit --amend -m "<new message>"

git branch topic/wip   
git reset --hard HEAD~3  
git checkout topic/wip 

git reset --hard ORIG_HEAD 

git reflog

git checkout HEAD@{11}

# to check what is in a commit 
git show HEAD@{11}

git branch my_branch <start-point>
git checkout my_branch

# Shorter
git checkout -b my_branch

git merge feature

# Delete the feature branch
git branch -d feature

git rebase <new-base>

git rebase --continue          # Continue a rebase after amending a commit.

git rebase --abort         # Abandon the current interactive rebase and return the 
                           # repository to its former state.

git rebase -i <new-base>

git cherry-pick <commit>

git stash <save> -m "message"
git pop                            # to apply and remove from stack
git stash --keep-index             # keep Index intact
git stash -u                       # include untracked files!
git stash list                     # list all stashes

# ... hack hack hack ...
$ git stash
$ edit emergency fix
$ git commit -a -m "Fix in a hurry"
$ git stash pop
# ... continue hacking ...

# ... hack hack hack ...
git checkout -b my_wip
git commit -a -m "WIP"
git checkout master
# edit emergency fix
git commit -a -m "Fix in a hurry"
git checkout my_wip
git reset --soft HEAD^
# ... continue hacking ...

git remote -v

git remote add upstream https://github.com/user/repo.git

git fetch origin <newbranch>
git checkout -b <newbranch> origin/<newbranch>

git pull --rebase