gitconfig

# This is Git's per-user configuration file.
[user]
name = Lucas de Moura Amaral
email = lucasmouraamaral@gmail.com
#
[alias]
    logs = log --graph --pretty=format:'%Cred%h%Creset %Cgreen(%ar)%d - %Creset%s%Creset %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
    mylog = !git log --author=\"$(git config user.name)\"
    sl = stash list --pretty=format:\"%C(red)%h%C(reset) - %C(dim yellow)(%C(bold magenta)%gd%C(dim yellow))%C(reset) %<(70,trunc)%s %C(green)(%cr) %C(bold blue)<%an>%C(reset)\"
    fpull = "!git fetch origin $(git rev-parse --abbrev-ref HEAD) && git reset --hard @{upstream}"
    fpush = "!git fetch origin $(git rev-parse --abbrev-ref HEAD) && git reset --hard @{upstream}"
    up = "! a=${1:-master}; git fetch origin $a && git branch -f $a origin/$a && git rebase $a #"
    nb = "!git checkout master && git checkout -b "



[merge]
    tool = vimdiff
    conflictstyle = diff3

[mergetool]
    prompt = false

[diff]
    tool = vimdiff