.gitconfig

[core]
  excludesfile = /Users/yuriteixeira/.gitignore_global
  autocrlf = input

[pager]
  diff = delta
  log = delta
  reflog = delta
  show = delta
  branch = false

[delta]
  plus-style = "syntax #012800"
  minus-style = "syntax #340001"
  syntax-theme = base16-256
  navigate = true

[interactive]
  diffFilter = delta --color-only

[push]
  default = current

[pull]
  default = current
  rebase = true

[rebase]
  autosquash = true

[diff]
  tool = nvim-diff

[merge]
	tool = diffconflicts
  #conflictstyle = diff3

[mergetool "nvim-diff"]
  cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'

[mergetool "diffconflicts"]
	cmd = nvim -c DiffConflictsWithHistory \"$MERGED\" \"$BASE\" \"$LOCAL\" \"$REMOTE\"
	trustExitCode = true

[mergetool]
	keepBackup = false

[color "diff"]
  meta = yellow bold

[alias]
  ### FLOW

  # clean
  cl = checkout -- . && git reset --hard && git clean -idfx

  # get
  u = pull --rebase
  f = fetch
  fa = fetch --all
  fo = fetch origin

  # change
  b = branch --sort=-committerdate 
  co = checkout
  com = checkout master
  a = add
  ap = add -p
  st = stash
  c = commit -v # with diff
  ca = commit -v --amend --no-edit
  can = commit -v --amend --no-edit -n
  cae = commit -v --amend
  ch = cherry-pick
  chc = cherry-pick --continue
  cha = cherry-pick --abort
  re = reset
  rep = reset HEAD~
  reom = reset origin/master
  rehom = reset --hard origin/master
  mt = mergetool

  # check
  s = status --ignore-submodules
  h = log --follow -p -M --stat # history of a file
  l = log --pretty='%C(red)%h %C(reset)%s %C(bold blue)%an, %C(green)%cr%C(yellow)%d %C(reset)' # usually my favorite format
  lo = log # default format (comes with more info)
  rl = reflog
  d = diff
  dc = diff --cached

  # organise
  r = rebase
  rc = rebase --continue
  ra = rebase --abort
  rom = rebase origin/master
  ri = rebase -i
  riom = rebase -i origin/master
  rih = rebase HEAD

  # send
  p = push -u
  pf = push --force-with-lease # checks for same parent commit on origin before