Skip to content

Instantly share code, notes, and snippets.

@gpakosz
Created October 8, 2015 12:14
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save gpakosz/5134e0005c6a2da297e0 to your computer and use it in GitHub Desktop.
Save gpakosz/5134e0005c6a2da297e0 to your computer and use it in GitHub Desktop.
My global .gitconfig
[user]
name = Gregory Pakosz
email = redacted
[color]
ui = auto
[core]
autocrlf = false
excludesfile = /Users/gregory/.gitignore
editor = vim
whitespace = cr-at-eol
trustctime = false
pager = `brew --prefix git`/share/git-core/contrib/diff-highlight/diff-highlight | less -R
[diff]
tool = p4merge
[difftool]
prompt = false
[mergetool]
keepTemporaries = false
prompt = false
[merge]
tool = p4merge
[alias]
#plog = log --graph --pretty=format:'%Cred%h%Creset %C(cyan)%an%Creset %C(yellow)%d%Creset %s %C(green)(%cr)%Creset' --abbrev-commit
plog = log --graph --color --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%C(bold blue)<%an>%Creset'
sfa = !git stash show -p | git apply
sfp = !git stash show -p | git apply && git stash drop
wip = !git add -u && git commit -m \"wip\"
sstatus = status -sb
fixup = commit -a --amend --no-edit
prune-remotes = !git remote prune $(git remote | tr \"\\n\" \" \")
branch-hof = !git for-each-ref --shell --format=\"printf '%%30s %%40s %%25s\\n' %(authorname) %(refname:short) %(committerdate:relative)\" --sort=committerdate refs/remotes/origin | sh
[pack]
threads = 1
[mergetool "splice"]
cmd="vim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'"
trustExitCode=true
[branch]
#autosetuprebase = always
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment