git help
git help COMMAND_NAME

git config --global user.name "niqdev"
git config --global user.email niqdev@gmail.com
git config --global color.ui true

mkdir REPOSITORY_NAME
cd REPOSITORY_NAME
git init

# changes since last commit
git status

# add files to staging area
git add .
git add <list of files> (add the list of files)
git add --all (add all files)
git add *.txt (add all txt files in current directory)
git add docs/*.txt (add all txt files in docs directory)
git add docs/ (add all files in docs directory)
git add "*.txt" (add all txt files in the whole project)

# commit changes
git commit -m "COMMENT"

# timeline history
git log

# show unstaged differences since last commit
git diff

# view staged differences (after add)
git diff --staged

# HEAD refers to last commit on current branch/timeline

# unstage files
git reset HEAD FILE_NAME

# discard/reject all change since last commit
git checkout -- FILE_NAME

# add to staged area and commit at the same time
# NOTE: this do NOT add any NEW (untracked) files
git commit -a -m "COMMENT"

# undo last commit: put all changes into staging i.e. move to commit before HEAD
git reset --soft HEAD^

# add file to the last commit and override comment
git add FILE_NAME
git commit --amend -m "COMMENT"

# undo last (1|2) commit and all changes
git reset --hard HEAD^
git reset --hard HEAD^^

# NOTE: do NOT do this after push: it breaks history!

# ORIGIN: name of the remote (just a bookmark to an url)

# push an existing repository
git remote add origin https://github.com/niqdev/git-notes.git

# show remote repository
git remote -v

# [origin= remote repository name]
# [master= local branch to push]
git push -u origin master

# pull changes down from the remote
git pull

# add new remote (origin|test|production) - associate name to url
git remote add NAME ADDRESS

# remove remote
git remote rm NAME

# push to remote (branch usually is master)
# '-u' option means:
# next time you run 'git push' you do not need to specify the name of the branch
git push -u NAME BRANCH

# create and add remote
heroku create
git remote -v
# after push trigger re-deploy
git push heroku master

# clone remote repository in a directory named 'git-notes'
git clone https://github.com/niqdev/git-notes.git
# clone remote repository in a directory named 'git-notes-alias'
git clone https://github.com/niqdev/git-notes.git git-notes-alias

# create new local branch (do NOT switch or move HEAD)
git branch BRANCH_NAME

# list local branch
git branch
# list remote branch
git branch -r
# list local and remote branch
git branch -a

# move HEAD to branch timeline
git checkout BRANCH_NAME

# creat new branch and switch timeline
git checkout -b BRANCH_NAME

# merge from-to (fast forward: no commit of merge)
# [BRANCH_TO= master][BRANCH_FROM= BRANCH_NAME]
git checkout BRANCH_TO
git merge BRANCH_FROM

# force no fast forward merge
git merge --no-ff BRANCH_FROM

# when merging, if change were made on both branches,
# git can't fast-forward so need to add merge commit (automatically)

git checkout -b BRANCH_NAME
# create remote branch
# links local branch to the remote branch (start tracking)
git push origin BRANCH_NAME

# show remote branches and if are tracked/sync
git remote show origin

# delete REMOTE branch
git push origin :REMOTE_BRANCH_NAME
# delete LOCAL branch (warning if uncommitted changes)
git branch -d LOCAL_BRANCH_NAME
# delete LOCAL branch (without warnings)
git branch -D LOCAL_BRANCH_NAME

# if try to push to a deleted remote branch
# to clean up deleted remote branches
git remote prune origin
git fetch -p

# heroku deploys only MASTER branch
# push and deploy local branch on heroku
git push heroku LOCAL_BRANCH_NAME:master

# a TAG is a reference to a commit (used mostly for reference versioning)
# list all tags
git tag
# checkout code at specific tag i.e TAG_NAME= v0.0.X
git checkout TAG_NAME
# add a new tag
git tag -a TAG_NAME -m "v0.0.X"
# push new tags
git push --tags

# pulls down any changes but doesn't merge them
git fetch

# what rebase internally does is (no merge commit):
# 1) move all changes in master (local) which are not
#    in origin/master (local sync with remote) to a temporary area
# 2) run all origin/master commit one at a time
# 3) run all commits in the temporary area on top, one at a time
git rebase XXX

# to avoid merge commit (fast forward)
git checkout BRANCH_FROM
git rebase BRANCH_TO
git checkout BRANCH_TO
git merge BRANCH_FROM

# resolve conflict manually
git rebase --continue
git rebase --skip
git rebase --abort

# history (SHA hash)
git log

git config --global color.ui true

# %ad = author date
# %an = author name
# %h = SHA hash
# %s = subject
# %d = ref names
git log --pretty=online
git log --pretty=format:"%h %ad - %s [%an]"

# log file modified
git log --oneline -p

# statistics
git log --oneline --stat

# graphical
git log --oneline --graph

# date ranges
git log --until=1.minute.ago
git log --since=1.day.ago
git log --since=1.hour.ago
git log --since=1.month.ago --until=2.weeks.ago
git log --since=2001-01-01 --until=2012-12-31

# changes since last commit
git diff
# difference between last commit and current state (includes staged and unstaged)
git diff HEAD

# parent of latest commit
git diff HEAD^
# grandparent of latest commit
git diff HEAD^^
# 5 minutes ago
git diff HEAD~5
# second most recent commit vs. most recent
git diff HEAD^..HEAD

# ranges of SHAs (also abbreviated)
git diff SHA_COMMIT1..SHA_COMMIT2

# between branches
git diff BRANCH_1 BRANCH_2

# time-based
git diff --since=1.week.ago --until=1.minute.ago

# difference line-by-line
# [commit hash][author][date][line][content]
git blame NOME_FILE --date short

# exclude only LOCAL folder/file
.git/info/exclude

# ignore in repository
.gitignore

# delete from local filesystem and untracked
git rm FILE_NAME

# if already tracking and want to remove (no deleted) i.e. for logs
# not deleted from local filesystem, only from git
# after untrucking, then add to .gitignore
git rm --cached FILE_NAME

git config --global user.name "niqdev"
git config --global user.email "niqdev@gmail.com"
git config --global colot.ui true
git config --global core.editor vim
# OS X only
git config --global merge.tool opendiff

# the global config loaded first, then repo config (overwrite)
git config user.email "repo-email@gmail.com"

git config --global alias.mylog "log --pretty=format:'%h %s [%an]' --graph"
git config --global alias.lol "log --graph --decorate --pretty=oneline --abbrev-commit --all"
git config --global alias.st status
git config --global alias.co checkout
git config --global alias.br branch
git config --global alias.ci commit