Config github

.gitconfig

[user]
  name = @@@@@@@
  email = @@@@@@@
[color "branch"]
  upstream = cyan
[core]
  excludesfile = /Users/@@@@@@/.gitignore_global
  ignorecase = true
  precomposeunicode = true
  conflictstyle = diff3
[log]
  abbrevCommit = true
[alias]
  tidy = rebase -i @{upstream}..
  ci = commit
  st = status
  oops = commit --amend --no-edit
  co = checkout
  lg = log --graph --pretty=tformat:'%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%an %ar)%Creset'
  wd = diff --color-words
  conflicts = !git ls-files -u | cut -f 2 | sort -u
  fp = push -f
  m = checkout master
  cb = checkout -b
[diff]
  mnemonicprefix = true
  wordRegex = .
[grep]
  extendedRegexp = true
[pull]
  rebase = preserve
[push]
  default = upstream
[help]
  format = html
[merge]
  conflictstyle = diff3