Git Config

.gitconfig

[core]
	autoCRLF = false
	editor = c:/bin/git/npp.cmd
[diff]
	tool = kd3
[merge]
    tool = kd3
[difftool "kd3"]
	cmd = c:/bin/git/kdiff3.cmd \"$LOCAL\" \"$REMOTE\"
[difftool]
	prompt = false
[mergetool "kd3"]
	cmd = c:/bin/git/kdiff3-merge.cmd \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
[alias]
    ci = commit
    undo = reset --hard
    up = pull origin master
    upd = pull origin develop
    upb = pull origin
    st = status
    unci = reset --soft HEAD~
    adp = add -p
    ad = add --all .
    to = push origin master
    tod = push origin develop
    tob = push origin
    lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
    unk = ls-files . --ignored --exclude-standard --others
    unt = ls-files . --exclude-standard --others