.gitconfig

gistfile1.txt

[push]
 default = simple
	followTags = true

[core]
 autocrlf = true
 editor = emacs
#  editor = "'C:/Program Files (x86)/Notepad++/notepad++.exe'  -multiInst -notabbar -nosession -noPlugin"
# sshCommand = "ssh -v"

[color]
 diff = auto
 status = auto
 branch = auto
 interactive = auto
 ui = 1
 pager = true

[color "status"]
 added = green bold
 changed = cyan bold
 untracked = magenta bold

[color "branch"]
 current = yellow reverse
 local = yellow
 remote = green

[color "diff"]
 frag = magenta bold
 old = red bold
 new = green bold

[alias]
 st = status
 co = checkout
 lg = log -p
 logs = log --stat --summary
# lol = log --graph  --color --decorate --pretty=oneline --abbrev-commit
 lol = "log --color --graph --pretty=format:'%C(auto)%h%Creset -%C(auto)%d%Creset %s %Cgreen(%cr)%C(bold blue)<%an>%Creset' --abbrev-commit"
 wipe = !git add -A && git commit -qm 'WIPE SAVEPOINT' && git reset HEAD~1 --hard
 cm = !git add -A && git commit -m
 save = !git add -A && git commit -m 'SAVEPOINT'
 undo = reset HEAD~1 --mixed
 amend = commit -a --amend
 ec = config --global -e
 lolme = !git lol --author $(git config user.email)
 logme = !git log --author $(git config user.email)
 find = grep -in
 standup1 = !git lolme --since=yesterday --branches
 changelog = !git log --no-merges --pretty=format:'- %s%n%b' --since='$(git show -s --format=%ad `git rev-list --tags --max-count=1`)'
 sp = !git stash && git pull && git stash pop


[help]
 autocorrect = 1

[merge]
	keepBackup = false;
	tool = p4merge
[mergetool "p4merge"]
	cmd = p4merge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
	keepTemporaries = false
	trustExitCode = false
	keepBackup = false
[diff]
# https://git-scm.com/docs/diff-config#diff-config-diffcompactionHeuristic
#	compactionHeuristic = false
	 indentHeuristic = on
[http]
	sslVerify = true
[gui]
	diffcontext = 8