gitconfig

[core]
    excludesfile = /Users/_user_/.gitignore_global
[fetch]
    prune = true
[alias]
    # log outputs
    lds = log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cgreen\\ [%cn]" --decorate --date=short
    ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cgreen\\ [%cn]" --decorate --numstat
    ls = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cgreen\\ [%cn]" --decorate
    # fancy log output
    log-fancy = log --graph --pretty=format:'%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%cr) %C(cyan)<%an>%Creset' --abbrev-commit --date=relative
    log-me    = !UN=$(git config user.name)&& git log --author="\"$UN\"" --pretty=format:'%h %cd %s' --date=short
    log-nice  = log --graph --decorate --pretty=oneline --abbrev-commit
#   standup = log --since '1 day ago' --oneline --author <YOUREMAIL> # hack it with your email and uncomment
#   jira = log --since '6am' --oneline --author <YOUREMAIL> # hack it with your email and uncomment

    assume = update-index --assume-unchanged
    unassume = update-index --no-assume-unchanged
    assumed = "!git ls-files -v | grep ^h | cut -c 3-"
    unassumeall = "!git assumed | xargs git update-index --no-assume-unchanged"

    amend = commit --amend -aC HEAD
    undo = reset --soft HEAD^

    # add all files
    all = add --all

    br = branch 

    co = checkout

    # checkout new branch
    cob = checkout -b
    com = checkout master

    cp = cherry-pick
    ci = commit

    # add new files with "commit message"
    cm = !git add -A && git commit -m
    cam = commit -am

    # diff
    dc = diff --cached
    diff = diff --word-diff
    wdiff = diff --word-diff=plain

    st = status -s

    # push to origin master
    pom = push origin master

    ready = rebase -i @{u}
    ri5 = rebase -i HEAD~5
    ri9 = rebase -i HEAD~9

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

    # stash untracked changes
    stuk = stash -u -k
    stashf = stash show -p | git apply -3 && git stash drop

    # git-svn
    spull = svn rebase
    spush = svn dcommit

[merge]
    tool = tortoisemerge
[mergetool "tortoisemerge"]
    path = tortoisemerge.exe