.gitconfig

[user]
	name = Laurent
	email = rlaurent@tvmag.com

[color]
  ui = true
  diff = auto
  status = auto
  branch = auto

[alias]
  hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
  st   = git status
  ci   = git commit
  gp   = git push
	lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
[core]
  editor = sublime_text -w
  whitespace = -trailing-space

[github]
  token = ***************************
  password = *******
	user = manolenso

[merge]
	keepBackup = false;
	tool = p4merge
	log = true

[mergetool "p4merge"]
	cmd = p4merge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
	keepTemporaries = false
	trustExitCode = false
	keepBackup = false

[diff]
	external = p4diff