Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: mattjbray/dotfiles
base: 30ba9989eb
...
head fork: mattjbray/dotfiles
compare: master
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Dec 14, 2012
@mattjbray Use the vi-mode plugin 5a57058
@mattjbray Add s=screen alias 7a85be4
@mattjbray Use custom oh-my-zsh theme fd0ca1e
@mattjbray Merge remote-tracking branch 'origin/master' 5d22609
@mattjbray gitconfig: remove push.default setting
Setting push.default=simple is incompatible with git v1.7.9.5
61749b0
Commits on Dec 22, 2012
@mattjbray Add .oh-my-zsh-custom
Contains custom zsh theme
80b06b7
Commits on Dec 25, 2012
@mattjbray Change prompt to '$' 0fd446e
Commits on Dec 30, 2012
@mattjbray zsh: add heroku to plugins 7c2990c
@mattjbray zsh: Use $HOME in RVM config 5895d34
Commits on May 19, 2013
@mattjbray Add .vimrc, using Vundle to manage vim plugins
No longer need a separate .vim repo
02d730c
@mattjbray Add updatevim.fish function d98792f
@mattjbray Add .oh-my-fish as a submodule 3f9a17b
@mattjbray Add submodule instructions to README 9f6625e
Commits on May 25, 2013
@mattjbray vimrc: fix tab settings 4d0cde3
@mattjbray Merge branch 'master' of github.com:mattjbray/dotfiles 2c0b2b1
@mattjbray vimrc: set wildmenu 626f5e4
Commits on May 29, 2013
@mattjbray Add .tmux.conf 361ae57
@mattjbray tmux: Fix powerline
(turns out variables aren't evaluated inside single quotes)
34a6ce0
@mattjbray tmux: add screen-like binding to switch to last window 7ac3980
@mattjbray tmux: Swap C-j and C-k 14b48f4
@mattjbray tmux: Use default paste binding 978bc24
@mattjbray vim: Use pip-installed powerline e4616a3
@mattjbray zshrc: Disable auto title (for tmux/screen) c023835
@mattjbray zshrc: Add .local/bin to path, set editor to vim 3adf70b
@mattjbray zshrc: configure for tmuxinator ae8d56f
@mattjbray tmuxinator: add tutemate ebb340d
@mattjbray zshrc: add /usr/local/bin to PATH cd66739
@mattjbray zshrc: add npm binaries to PATH 8463dc2
@mattjbray tmux: add vim bindings for resize-pane fb6d82f
Commits on Jun 16, 2013
@mattjbray zsh: Add gem completion plugin 33e25fb
Commits on Jun 22, 2013
@mattjbray Vim: install Unite, remove FuzzyFinder 75103f7
Commits on Jul 08, 2013
@mattjbray Split oh-my-zsh plugins to separate lines bfd98d1
@mattjbray zshrc: set TERM=xterm-256color if we have a DISPLAY ca00198
@mattjbray Merge branch 'master' of github.com:mattjbray/dotfiles
Conflicts:
	.zshrc
405fb2f
@mattjbray zshrc: Add plugins
bundler, fabric, node, npm, pip, python, rails3, rails4, rake, rsync,
ruby, tmux, virtualenv, vundle
2943467
@mattjbray zshrc: Allow deletion past insertion point 1c87a58
@mattjbray zsh: Add virtualenv and rvm info to prompt 94bf2d7
Commits on Jul 12, 2013
@mattjbray Vim: Don't reload vimrc on write 7da1773
@mattjbray Vim: Unite - use FuzzyFinder style keybindings 6234676
@mattjbray Zsh: Bind ^E to end-of-line in insert mode ab4325b
@mattjbray Git: Ignore .DS_Store files 7f20070
@mattjbray Remove submodules (PITA) 88f4d14
@mattjbray Zsh: Add Optimor aliases 2923679
@mattjbray Fix README 7f81235
Commits on Jul 31, 2013
@mattjbray tmux: set mouse-mode on af633c8
@mattjbray tmux: set terminal titles 2eb700d
@mattjbray Merge branch 'master' into optimor c5c4946
Commits on Aug 21, 2013
@mattjbray Revert "tmux: set mouse-mode on"
This reverts commit af633c8.

Conflicts:
	.tmux.conf
8f0bd2d
@mattjbray git: set global excludes file; set push default tracking 40e1d94
@mattjbray vim: map <leader>T to NERDTreeFind 8fd1d7f
Commits on Aug 22, 2013
@mattjbray zsh: remove screen alias 04e531b
Commits on Aug 24, 2013
@mattjbray Fix readme fbf3afd
Commits on Sep 17, 2013
@mattjbray zsh: prioritize ~/.local/bin in PATH 445fe48
@mattjbray Merge branch 'master' of github.com:mattjbray/dotfiles 6f663de
@mattjbray vim: add matchit and textobj-rubyblock ed62996
@mattjbray vim: auto fold javascript and ruby files a1a5bdd
@mattjbray X: reverse scroll direction 9874eba
@mattjbray vim: add jshint2 0284ec3
Commits on Oct 08, 2013
@mattjbray vim: add YouCompleteMe 866607a
Commits on Nov 05, 2013
@mattjbray zsh: add vagrant plugin 0f054e0
@mattjbray zsh: fix rvm 86f1fe3
@mattjbray zsh: use /home/mattjbray in bmvenv 0024a75
Commits on Nov 15, 2013
@mattjbray vim: make vimrc awesome, add dragvisuals, vmath 06989e3
Commits on Nov 18, 2013
@mattjbray zsh: load system-installed rvm e30e76e
Commits on Nov 20, 2013
@mattjbray git: add tags to gitignore 14f3a91
Commits on Nov 24, 2013
@mattjbray vim: add emmet 49bcaae
@mattjbray zsh: use antigen 01337d4
Commits on Nov 25, 2013
@mattjbray zsh: add vundle d86fd19
@mattjbray zsh: fix optimor aliases eaf9e94
@mattjbray zsh: prioritize /usr/local/bin 651ed2a
Commits on Nov 29, 2013
@mattjbray zsh: function for grepping bmstack logs 7d0daa2
Commits on Dec 04, 2013
@mattjbray zsh: fix grep_logs for frontend 0a3e82a
Commits on Dec 05, 2013
@mattjbray zsh: automatically clone antigen 672a887
Commits on Dec 10, 2013
@mattjbray Update README 14144df
Commits on Dec 12, 2013
@mattjbray xinitrc: watch for monitor changes 857a0ff
@mattjbray conky: show volume 8d2aed7
@mattjbray xmodmap: don't reverse scroll buttons 03d2cc2
Commits on Dec 19, 2013
@mattjbray dunst: add dunstrc 696eb51
Commits on Jan 02, 2014
@mattjbray remove tmuxinator 949268f
Commits on Jan 10, 2014
@mattjbray Merge branch 'master' of github.com:mattjbray/dotfiles a5ea46c
@mattjbray X: use dunstrc, pulseaudio, xbindkeys a8ce959
@mattjbray X: bind kbd light and launch keys 0b8431d
Commits on Jan 16, 2014
@mattjbray zsh: update deploy_backend alias 2660aef
@mattjbray zsh: fix grep_logs alias 8885852
Commits on Apr 23, 2014
@mattjbray conky: tweaks for macbook air 7b36110
@mattjbray vim: add projectile, vim-jst and vim-scala 7075cea
@mattjbray vim: foldmethod=indent for jst 91501a3
Commits on Jun 17, 2014
@mattjbray [dwm] add dwm config.h 699503a
@mattjbray [tig] remove config (new version has sane defaults) 91e1bf3
@mattjbray vim: don't use python-mode's autocomplete 37cbc47
@mattjbray vim: remove unite 9617a3f
@mattjbray vim: projectile -> projectionist 9e021e8
@mattjbray dwm: fix webcmd 1b755b1
Commits on Sep 20, 2014
@mattjbray zsh: antigen <-> prezto f947c60
@mattjbray remove zshrc (now tracked in prezto repo) 37b63d5
Commits on Sep 23, 2014
@mattjbray vim: use ack for grepprg 0bef3cc
@mattjbray vim: adjust bundles 2e75779
Commits on Sep 25, 2014
@mattjbray Delete mattjbray.zsh-theme 24a017c
@mattjbray Delete .Xresources a5a6de6
Commits on Nov 22, 2014
@mattjbray git: editor=vim 04fb6d9
@mattjbray Merge branch 'master' of github.com:mattjbray/dotfiles a367760
@mattjbray xinitrc: stalonetray 56f1dd0
@mattjbray vim: don't regenerate ropeproject 05e5221
@mattjbray vim: <leader>m -> dispatch 4bd1d3c
Commits on Dec 16, 2014
@mattjbray tmux: use system-installed powerline 88c89ab
@mattjbray vim: use python3 powerline 1403b14
@mattjbray vim: fixes for latest Vundle.vim a735729
Commits on Dec 22, 2014
@mattjbray Update README 7b02008
Commits on Jan 26, 2015
@mattjbray git: lol alias 7dc250c
@mattjbray Merge branch 'master' of github.com:mattjbray/dotfiles d301c86
Something went wrong with that request. Please try again.