Created
February 13, 2018 18:20
-
-
Save jburwell/b0dcfa64f4b6bea90e1195b952796e86 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[user] | |
name = John Burwell | |
email = [email protected] | |
[credential] | |
helper = osxkeychain | |
[github] | |
user = jburwell | |
[push] | |
default = current | |
[color] | |
ui = true | |
[core] | |
excludesfile = ~/.gitignore | |
[mergetool "Kaleidoscope"] | |
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot | |
trustexitcode = true | |
[merge] | |
tool = Kaleidoscope | |
[difftool "Kaleidoscope"] | |
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\" | |
[difftool] | |
prompt = false | |
[mergetool] | |
prompt = false | |
[diff] | |
tool = Kaleidoscope | |
[alias] | |
aliases = config --get-regexp alias | |
force-ci = "!git commit --amend --no-edit && git push -f" | |
# Borrowed from https://gist.github.com/gnarf/5406589 | |
pr = "!f() { git fetch -fu ${2:-origin} refs/pull/$1/head:pr/$1 && git checkout pr/$1; }; f" | |
pr-clean = "!git for-each-ref refs/heads/pr/* --format='%(refname)' | while read ref ; do branch=${ref#refs/heads/} ; git branch -D $branch ; done" | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
*.pyc | |
*.swp | |
.DS_Store | |
.#* | |
*/*/.project | |
**/.classpath | |
**/.settings/* | |
.rebar | |
\#*\# | |
*.iml | |
.idea |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
syntax on | |
set list listchars=tab:▷⋅,trail:⋅,nbsp:⋅ | |
"set statusline=%F%m%r%h%w\ [TYPE=%Y\ %{&ff}]\ \ [%l/%L\ (%p%%) | |
"set statusline=%t[%{strlen(&fenc)?&fenc:'none'},%{&ff}]%h%m%r%y%=%c,%l/%L\ %P | |
set ruler | |
set number | |
set tabstop=2 | |
set shiftwidth=2 | |
set expandtab | |
set backspace=indent,eol,start | |
set nocompatible | |
" Mac clipboard integration -- http://evertpot.com/osx-tmux-vim-copy-paste-clipboard/ | |
set clipboard=unnamed | |
set guifont=Menlo\ Regular:h14 | |
filetype plugin indent on | |
call pathogen#infect() | |
call pathogen#helptags() | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment