Git Alias

gistfile1.txt

[user]
	name = ***
	email = ****
[core]
	autocrlf = true
	editor = 'C:/Program Files (x86)/Notepad++/notepad++.exe'\
    -multiInst -notabbar -nosession -noPlugin
	trustctime = false
[alias]
	co = checkout
	cob = checkout -b
	cm = !git add -A && git commit -m
	save = !git add -A && git commit -m 'SAVEPOINT'
	wip = !git add -A && git commit -m 'WIP'
	undo = reset HEAD~1 --mixed
	amend = commit -a --amend
	wipe = !git add -A && git commit -qm 'WIPE SAVEPOINT' && git reset HEAD~1 --hard
	up = !git pull --rebase --prune $@ && git submodule update --init --recursive
	ll = log --pretty=oneline
	llp = log --pretty=format:'%C(yellow)%h%Creset - %C(bold blue)%an%Creset %C(green)(%ar)%Creset : %s'
	uc = !git clean -df && git checkout -- .
	clean-reset = !git rm --cached -r . && git reset --hard
	
[merge]
    tool = kdiff3
[mergetool "kdiff3"]
	keepBackup = false
    cmd = \"C:\\\\Program Files (x86)\\\\KDiff3\\\\kdiff3\" $BASE $LOCAL $REMOTE -o $MERGED