gitconfig

[filter "hawser"]
	clean = git hawser clean %f
	smudge = git hawser smudge %f
	required = true
[mergetool "Kaleidoscope"]
	cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
	trustexitcode = true
[merge]
	tool = Kaleidoscope
[difftool "Kaleidoscope"]
	cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[difftool]
	prompt = false
[mergetool]
	prompt = false
[diff]
	tool = Kaleidoscope

[user]
  name = Wojtek G
  email = wojtek.galaj@gmail.com
  logallrefupdates = true

[core]
  safecrlf = false
  quotepath = false
	precomposeunicode = true
	editor = vim
	pager = diff-so-fancy | less --tabs=4 -RFX

[color]
  diff = true
	ui = true

[color "status"]
  added = green
  changed = blue
  untracked = bold magenta

[difftool "vimdiff"]
  cmd = vim -f -d \"$LOCAL\" \"$REMOTE\"

[alias]
  cm = shortlog -nse --no-merges

  fi = !git ls-files | grep -i
  gr = grep -Ii

  # log (hash, relative date, commit, commiter)
  ld = log --pretty=format:'%C(yellow)%h %C(bold red)%ad%C(reset)%C(red)%d %C(reset)%s%C(blue) [%cn]' --decorate --date=relative
  # log git history tree graph
  lg = log --graph --decorate
  # log edited files per commit
  lf = log --pretty=format:'%C(yellow)%h%C(red)%d %C(reset)%s%C(blue) [%cn]' --decorate --numstat

  lol = log --graph --pretty=format:\"%C(yellow)%h%Creset%C(cyan)%C(bold)%d%Creset %C(cyan)(%cd)%Creset %C(green)%ce%Creset %s\"

  ph = push origin
  pl = pull origin
  co = checkout
  br = branch

  s = status -vsb

  # if no arguments clear the stash
  # or drop multiple stashes passing the numbers
  # usage: git shd 2 5 6 9
  shd = "!f() { !(($#)) && git stash clear || for ((i=1;i<=$#;i++)); do n=$((${!i}+1-$i)); git stash drop stash@{$n} & done; wait; }; f"

  # show specified stash changes
  # usage: git shs 3
  shs = !sh -c 'git stash show -p stash@{$0}'

  gh = !git init && git add . && git commit -am 'add(*): initial commit' && git remote add origin git@github.com:julien/$(basename $PWD).git && git push -u origin master

  # show un merged
  sm = diff --name-status --diff-filter=U
  unstage = reset --
	ac = !git add -A && git commit


[http]
  sslVerify = false

[help]
  autocorrect = 1

[push]
  default = simple

[credential]
	helper = osxkeychain