gitconfig

[user]
	name = John Salvatier
	email = jsalvatier@gmail.com

[core]
	excludesfile = /home/john/.gitignore_global
        editor = nvim
[merge]
	conflictstyle = diff3


[color]
	ui = auto

# color {{{
[color]
    branch = auto
    diff = auto
    status = auto

[color "branch"]
    current = red reverse
    local = blue
    remote = green

[color "diff"]
    meta = yellow bold
    frag = magenta bold
    old = red bold
    new = green bold

[color "status"]
    added = yellow
    changed = green
    untracked = cyan

# }}}
# push/pull/diff/options {{{
[push]
    default = upstream
[pull]
    default = current
[diff]
  memonicprefix = true
[branch]
  autosetuprebase = always
[apply]
  whitespace = nowarn

#}}}
# difftools {{{
[difftool "sourcetree"]
	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
	path = 
[mergetool "sourcetree"]
	cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
	trustExitCode = true


[merge]
    keepBackup = false;
    tool = p4merge
[mergetool "p4merge"]
    cmd = echo "-- $BASE --" && p4merge "\"$BASE\"" "\"$LOCAL\"" "\"$REMOTE\"" "\"$MERGED\""
    keepTemporaries = false
    trustExitCode = false
    keepBackup = false

# }}}
# alias {{{
[alias]

    st = status -s

    #cl = clone

    ci = commit
    cm = commit -m
    cam = commit -a -m
    #ca = commit --amend
    amend = commit --amend
    #caa = commit -a --amend -C HEAD
    filelog = log -u
    #fl = log -u

    ai = add --interactive

    co = checkout
    br = branch 
    #"!git branch -ra | grep -v done"
    #bra = branch -ra
    #list commands
    
    lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
    le = log --oneline --decorate
    ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
    ls1 = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate
    lds = log --pretty=format:"%C(yellow)%h\\ %C(green)%ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=short --graph
    ls = log --pretty=format:"%C(green)%h\\ %C(yellow)[%ad]%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=relative
    lc  = "!f() { git ll "$1"^.."$1"; }; f"
    lnc = log --pretty=format:"%h\\ %s\\ [%cn]"
    
    #list all aliases
    la = "!git config -l | grep alias | cut -c 7-"
    
    diff = diff --word-diff
    #d = diff --word-diff
    #dc = diff --cached
    
    #list modified files in last commit
    dl = "!git ll -1"
    #diff last commit
    dlc = diff --cached HEAD^
    #dr  = "!f() { git diff "$1"^.."$1"; }; f"
    #diffr  = "!f() { git diff "$1"^.."$1"; }; f"
    branch = branch -ra

    #reset commands
    #r = reset
    #r1 = reset HEAD^
    #r2 = reset HEAD^^
    #rh = reset --hard
    #rh1 = reset HEAD^ --hard
    #rh2 = reset HEAD^^ --hard

    #git svn
    #svnr = svn rebase
    #svnd = svn dcommit
    #svnl = svn log --oneline --show-commit

    #stash
    sl = stash list
    spop = stash pop
    spush = stash save

    #cp = cherry-pick
    grep = grep -Ii
    #gr = grep -Ii
    #grep from root folder
    #gra = "!f() { A=$(pwd) && TOPLEVEL=$(git rev-parse --show-toplevel) && cd $TOPLEVEL && git grep --full-name -In $1 | xargs -I{} echo $TOPLEVEL/{} && cd $A; }; f"

    #grep on filename
    f = "!git ls-files | grep -i"

    #rename branch tree to done-
    done = "!f() { git branch | grep "$1" | cut -c 3- | grep -v done | xargs -I{} git branch -m {} done-{}; }; f"

    #assume aliases
    #assume = update-index --assume-unchanged
    #unassume = update-index --no-assume-unchanged
    #show assumed files
    #assumed = "!git ls-files -v | grep ^h | cut -c 3-"
    #unassume all the assumed files
    #unassumeall = "!git assumed | xargs git update-index --no-assume-unchanged"
    #assumeall = "!git st -s | awk {'print $2'} | xargs git assume"

    lasttag = describe --tags --abbrev=0
    #lt = describe --tags --abbrev=0

    #merges
    ours = "!f() { git co --ours $@ && git add $@; }; f"
    theirs = "!f() { git co --theirs $@ && git add $@; }; f"

    #list remotes
    rem="!git config -l | grep remote.*url | tail -n +2"

    #create a GitHub remote from the command line and upload 
    gh-just-create-repo = !sh -c \"curl -u \\\"jsalvatier\\\" https://api.github.com/user/repos -d \\\"{\\\\\\\"name\\\\\\\":\\\\\\\"$1\\\\\\\"}\\\"\" -
    gh-create = !git gh-just-create-repo $1 && git remote add jsalvatier git@github.com:jsalvatier/$1.git && git push -u jsalvatier master && :

    #see pulled changes
    pulled = log -p --reverse --no-merges --stat @{1}..

# }}}
[pager]
	diff = diff-so-fancy | less --tabs=1,5 -RFX
	show = diff-so-fancy | less --tabs=1,5 -RFX
[color "diff-highlight"]
	oldNormal = red bold
	oldHighlight = red bold 52
	newNormal = green bold
	newHighlight = green bold 22