git config

gistfile1.txt

[user]
	name = Yilen Pan
	email = [email protected]
[color]
  ui = auto
[alias]
	st = status
  lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %Cblue<%an>%Creset' --abbrev-commit --date=relative
  ch = checkout -
  wslog = log --ignore-space-at-eol -p -w -b
  wsdiff = diff --ignore-space-at-eol -w -b --no-ext-diff
	a = add -p
	d = difftool
	co = checkout
	br = branch
	ci = commit -v
	brd = branch -D
    yolo = !git commit --amend --no-edit && git push -f
[diff]
	tool = vimdiff
[merge]
    keepBackup = false
    tool = custom
                            
[mergetool "custom"]
    cmd = /Applications/p4merge.app/Contents/MacOS/p4merge "$PWD/$BASE" "$PWD/$REMOTE" "$PWD/$LOCAL" "$PWD/$MERGED"
    keepTemporaries = false
    trustExitCode = false
    keepBackup = false