gitconfig

.gitconfig

[credential]
  helper = osxkeychain
  useHttpPath = true



#
# GIT CONFIG FILE`
#
## GATHER FROM ONLINE: https://goo.gl/2knYDc


# core {{{
[core]
    editor = code -n -w
    excludesfile = /Users/vn0q733/.gitignore_global
    pager = less -F -X
	autocrlf = input
	safecrlf = false

#}}}

# user {{{
[user]
	email = [email protected]
	name = Frank Gutierrez

#}}}

# color {{{
[color]
    ui = auto

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

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

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

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

# }}}

# alias {{{
[alias]
    # basic {{{
    st = status -s
    cl = clone
    ci = commit
    co = checkout
    br = branch
    r = reset

    cp = cherry-pick
    gr = grep -Ii
    # }}}

    # basic {{{
    rv = remote -v
    up = remote add upstream
    # }}}

    # tweak defaults {{{
    diff = diff --word-diff
    branch = branch -ra
    grep = grep -Ii
    bra = branch -ra
    # ai = add --interactive
    # grep on filename
    f = "!git ls-files | grep -i"
    # }}}

    # commit {{{
    cm = commit -m
    cma = commit -a -m
    ca = commit --amend
    amend = commit --amend
    ane = commit --amend --no-edit
    caa = commit -a --amend -C HEAD
    # }}}
    # log commands {{{
    ls = log --pretty=format:"%C(green)%h\\ %C(yellow)[%ad]%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=relative
    ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
    lc  = "!f() { git ll "$1"^.."$1"; }; f"
    lnc = log --pretty=format:"%h\\ %s\\ [%cn]"
    fl = log -u
    filelog = log -u
    # }}}

    # diff {{{
    d = diff --word-diff
    dc = diff --cached
    # diff last commit
    dlc = diff --cached HEAD^
    dr  = "!f() { git diff -w "$1"^.."$1"; }; f"
    diffr  = "!f() { git diff "$1"^.."$1"; }; f"
    # }}}

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

    # stash {{{
    sl = stash list
    sa = stash apply
    ss = stash save
    sv = stash show
    svd = stash show -p
    se = checkout stash@{0} --
    sf = "!git show stash@{0}:$1"
    # }}}

    # assume aliases {{{
    # list all aliases
    la = "!git config -l | grep alias | cut -c 7-"
    # }}}

# }}}


[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


[push]
	followTags = true