Git Aliases

[Alias]
  st = status
  ci = commit
  cl = clone
  br = branch
  co = checkout
  df = diff
  dc = diff --cached
  #resets
  rh = reset --hard
  discard = reset HEAD --hard
  #others
  who = shortlog -s --
  forkdiff = !bash -c 'git diff $(git merge-base "$1" "$2") "$2" "${@: 3}" ' -
  untrack = rm --cache --
  #list aliases
  new = !sh -c 'git log $1@{1}..$1@{0} "$@"
  lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
  ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
  fl = log -u
  lg-full = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative --pretty=full --name-status
  conflicted = ls-files -u
  la = "!git config -l | grep alias | cut -c 7-"
  ls-ignored = !git ls-files -v | grep ^[a-z]
  #Self made
  ignore = update-index --assume-unchanged
  unignore = update-index --no-assume-unchanged
  mmnff = merge --no-ff

Other configs

[user]
  name = John Doe
  email = [email protected]
[color]
	ui = true
[core]
	autocrlf = input
	whitespace = trailing-space,space-before-tab,indent-with-non-tab
[push]
	default = simple
[url "https://"]
	insteadOf = git://