.gitconfig

[user]
	name = Alexander Rinass
	email = alex@rinass.net
[core]
  editor = mate -w	
[github]
  user = alexrinass
[color]
	branch = auto
	diff = auto
	interactive = auto
	status = auto
[alias]
  st = status -sb
  co = checkout
  up = "!git stash save && git pull && git stash pop"
  sync = "!git stash save && git pull && git push && git stash pop"
  lsb = "branch -v"
  ls = "log --oneline --decorate"
  lsg = "log --oneline --decorate --graph"
  untrack = "rm -r --cached --"
  unstage = "reset HEAD --"
  rf = "checkout HEAD --"
  me = "log --author='alex' --after=yesterday --no-merges --oneline --reverse"
  lsi = "ls-files --others --ignored --exclude-standard"
  lsit = "ls-files --ignored --exclude-standard"
  ksdiff = difftool
[status]
  showUntrackedFiles = normal
[merge]
  tool = opendiff
[mergetool "ksdiff"]
  cmd = "/usr/local/bin/ksdiff -w $BASE $LOCAL $REMOTE $MERGED"
[diff]
  tool = ksdiff
[difftool "ksdiff"]
  cmd = "/usr/local/bin/ksdiff $LOCAL $REMOTE"
[difftool]
  prompt = false

.gitconfig-linux

[user]
  name = Alexander Rinass
  email = alex@rinass.net
[core]
  editor = vim
[color]
  ui = auto
  branch = auto
  diff = auto
  interactive = auto
  status = auto
[alias]
  st = status -sb
  co = checkout
  lsb = "branch -v"
  ls = "log --oneline --decorate"
  lsg = "log --oneline --decorate --graph"
  untrack = "rm -r --cached --"
  unstage = "reset HEAD --"
  rf = "checkout HEAD --"
  me = "log --author='alex' --after=yesterday --no-merges --oneline --reverse"
  lsi = "ls-files --others --ignored --exclude-standard"
  lsit = "ls-files --ignored --exclude-standard"
[status]
  showUntrackedFiles = normal