w p4merge, notepad++, trayburn aliases & timesheet & bprune alias

my git config

[user]
	name = Firstname Lastname
	email = [email protected]
[core]
	editor = 'C:\\Program Files (x86)\\Notepad++\\notepad++.exe' -multiInst -notabbar -nosession -noPlugin
	
	
[diff]
    tool = bc4
[difftool]
      prompt = false
      keepbackup = false
      trustexitcode = true
[difftool "bc4"]
      cmd = 'C:\\Program Files (x86)\\Beyond Compare 4\\BCompare.exe' -expandall -solo \"$LOCAL\" \"$REMOTE\" 
[difftool "p4merge"]
      cmd = 'C:\\Program Files\\Perforce\\p4merge.exe' \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"	  
	
[merge]
	tool = p4merge
[mergetool]
      prompt = false
	  keepbackup = false
          trustexitcode = true
[mergetool "bc4"]
      cmd = 'C:\\Program Files (x86)\\Beyond Compare 4\\BCompare.exe' -expandall -solo \"$LOCAL\" \"$REMOTE\"
[mergetool "p4merge"]
      cmd = 'C:\\Program Files\\Perforce\\p4merge.exe' \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"		

[alias]
	diffdir = difftool --dir-diff --tool=bc4 --no-prompt
        bprune = !git branch --merged | egrep -v '(^\\*|master|develop)' | xargs git branch -d
	
	a = add -A
	b = branch
	c = checkout
	f = fetch
	l = log --pretty=oneline --abbrev-commit
	r = rebase --interactive HEAD~10
	s = status
	sp = -p status
	pr = pull --rebase
	pom = push origin master
	pos = push origin source
	rc = rebase --continue
	ra = rebase --abort
	ss = -p status -s
	lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
	lga = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative --all
	ll = log --pretty=oneline --abbrev-commit --max-count=15
	lc = log --stat --summary
	tpr = tf pull --rebase --deep
	tcd = tf checkin --deep
	prune = fetch --prune
	aliases = config --get-regexp alias
	amend = commit --amend
	bl = blame -w -M -C
	bra = branch -rav
	branches = branch -rav
	filelog = log -u
	hist = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue) [%an]%Creset' --abbrev-commit --date=relative
	last = log -p --max-count=1 --word-diff
	lastref = rev-parse --short HEAD
	lasttag = describe --tags --abbrev=0
	pick = add -p
	remotes = remote -v show
	stage = add
	statusSB = status -sb
	standup = log --since yesterday --oneline --author 'coridrew'
	stats = diff --stat
	sync = ! git fetch upstream -v && git fetch origin -v && git checkout master && git merge upstream/master
	
	timesheet = reflog --pretty=format:'(%cd) %h - %d %s [%an]' --abbrev-commit --date-order --date=local --author=coridrew
	ts = reflog --pretty=format:'(%cd) %h - %d %s [%an]' --abbrev-commit --date-order --date=local --author=coridrew
	timesheetPretty = reflog --pretty=format:'%Cgreen(%cd) %Cred%h%Creset -%C(yellow)%d%Creset %s %C(bold blue) [%an]%Creset' --abbrev-commit --date-order --date=local --author=coridrew
	tsp = reflog --pretty=format:'%Cgreen(%cd) %Cred%h%Creset -%C(yellow)%d%Creset %s %C(bold blue) [%an]%Creset' --abbrev-commit --date-order --date=local --author=coridrew
	timesheetAll = reflog --pretty=format:'(%cd) %h - %d %s [%an]' --abbrev-commit --date-order --date=local
	tsa = reflog --pretty=format:'(%cd) %h - %d %s [%an]' --abbrev-commit --date-order --date=local
	timesheetAllPretty = reflog --pretty=format:'%Cgreen(%cd) %Cred%h%Creset -%C(yellow)%d%Creset %s %C(bold blue) [%an]%Creset' --abbrev-commit --date-order --date=local
	tsap = reflog --pretty=format:'%Cgreen(%cd) %Cred%h%Creset -%C(yellow)%d%Creset %s %C(bold blue) [%an]%Creset' --abbrev-commit --date-order --date=local
	
	undo = reset head~
	unstage = reset HEAD
	wdiff = diff --word-diff
	who = shortlog -s -e --
	up = !git fetch --all --prune && git rebase origin/master && git submodule update && git push . origin/master:master 2> /dev/null
	pub = !git push origin HEAD:master && git push . HEAD:master && git checkout master
	cb = checkout -b
	fap = fetch --all --prune
	pp = pull --prune
	tprs = tf pull --rebase --shallow
	tcds = tf checkin --shallow

[color]
	branch = auto
	diff = auto
	status = auto
[color "branch"]
	current = yellow reverse
	local = yellow
	remote = green
[color "diff"]
	meta = yellow bold
	frag = magenta bold
	old = red bold
	new = green bold
[color "status"]
	added = yellow
	changed = green
	untracked = cyan