.gitconfig

gistfile1.cfg

[alias]
	co = checkout
	st = status
	br = branch
	re = rebase
	hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
	cat = cat-file -t
	type = cat-file -t
	dump = cat-file -p
[color "branch"]
	current = red bold
	local = normal
	remote = yellow bold
	plain = normal
[color "status"]
	header = normal
	added = red bold
	updated = green bold
	changed = cyan bold
	untracked = cyan bold
	nobranch = red bold
[core]
	editor = D:/Dev/bin/Notepad2/Notepad2.exe
[diff]
	tool = p4merge
[difftool]
	prompt = false
[difftool "p4merge"]
	cmd = "p4merge.exe" \"$LOCAL\" \"$REMOTE\"
	keepBackup = false
	trustExitCode = false
[merge]
	tool = p4merge
[mergetool]
    prompt = false
    keepBackup = false
[mergetool "p4merge"]
	cmd = "p4merge.exe" \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
	trustExitCode = false
[push]
	default = upstream
[credential]
	helper = winstore
[pack]
	packSizeLimit = 2g
[help]
	format = html
[diff "astextplain"]
	textconv = astextplain
[rebase]
	autosquash = true