git config

.gitconfig

[alias]
    st = status
    co = checkout
    sw = switch
    br = branch
    cp = cherry-pick
    df = diff
    cm = commit -m
    unstage = reset -q HEAD --
    uncommit = reset --mixed HEAD~
    last = log -1 HEAD --format=format:"%Cred%H"
    graph = log --graph -10 --branches --remotes --tags --format=format:'%Cgreen%h %Creset→ %<(75,trunc)%s (%cN, %ar) %Cred%d' --date-order
    history = log -10 --format=format:'%Cgreen%h %Creset→ %s (%cN, %ar)'
    amend = commit --amend
    back = checkout "-"
    nevermind = !git reset --hard HEAD && git clean -d -f
    pull-sub = !git submodule foreach git pull origin master
  fa = fetch --all -p
    master = !git switch `git remote show origin | sed -n '/HEAD branch/s/.*: //p'`
[diff]
    tool = WinMerge
[difftool "WinMerge"]
    path = C:/Program Files (x86)/WinMerge/WinMergeU.exe
    cmd = \"C:/Program Files (x86)/WinMerge/WinMergeU.exe\" -f \"*.*\" -e -u -r  -wl -wr -dl \"LOCAL\" -dr \"REMOTE\"  \"$LOCAL\" \"$REMOTE\"
[merge]
    tool = WinMerge
[mergetool "WinMerge"]
    path = C:/Program Files (x86)/WinMerge/WinMergeU.exe
    cmd = \"C:/Program Files (x86)/WinMerge/WinMergeU.exe\" -e -u \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
[alias]
    windiff = difftool -y -d -t WinMerge
    winmerge = mergetool -y -t WinMerge
[mergetool]
	keepBackup = false
[color]
	ui = auto
[core]
	quotepath = false