.gitconfig

[credential]
    helper = store
[core]
    editor = vim
[color]
    ui = auto
[alias]
    chp = cherry-pick
    dfs = diff --staged
    df = diff
    sh = stash
    st = status
    co = checkout
    br = branch
    rb = rebase
    mg = merge
    cm = commit -v
    cmm = commit -v -m
    cma = commit -v --amend
    sw = switch
    rt = reset
    rs = restore
    lg = log --graph --abbrev-commit --decorate --format=format:'%C(cyan)%h%C(reset) - %C(green)(%as - %ar)%C(reset) %C(white)%s%C(reset) %C(blue)- %an%C(reset)%C(yellow)%d%C(reset)'
    lga = log --all --graph --abbrev-commit --decorate --format=format:'%C(cyan)%h%C(reset) - %C(green)(%as - %ar)%C(reset) %C(white)%s%C(reset) %C(blue)- %an%C(reset)%C(yellow)%d%C(reset)'
    conflicted = !vim +Conflicted
[diff]
    tool = vimdiff
[difftool]
    prompt = false
[rerere]
    enabled = true
[mergetool "vim-conflicted"]
    cmd = vim +Conflicted
[merge]
    tool = vim-conflicted