Skip to content

Comparing changes

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

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
This comparison is big! We’re only showing the most recent 250 commits
Commits on Nov 02, 2012
@robmiller Add a git alias, "git log-merges", to show only merge commits. 359f807
Commits on Nov 06, 2012
@robmiller Add a function for compiling all Compass projects under the current d…
Commits on Nov 09, 2012
@robmiller Rebase by default when pulling. 834fa23
@robmiller Add better Ruby syntax ab2fb36
Commits on Nov 20, 2012
@robmiller Add Kaleidescope as difftool to gitconfig 76a2c4b
Commits on Nov 26, 2012
@robmiller Add alias for difftool'ing the current branch to master. 5d713a6
Commits on Nov 27, 2012
@robmiller Add shortcuts to assume-unchanged files 714354c
@robmiller Spaces to tabs. 18259f3
@robmiller code-review alias: don't just assume code files, it's a needless change 3bb4007
@robmiller Add shortcuts for "checkout --theirs" and "checkout --ours" 0e9c8ef
@robmiller Add shortcuts for diffing the last commit and for diffing the stage. 93d82ab
@robmiller Shortcut for pushing all branches. 3470102
@robmiller Add alias for "ls -ahl", which I type absurdly frequently 8d8aeb7
Commits on Dec 01, 2012
@robmiller Disable Git plugin for zsh; it adds aliases I never use c928951
@robmiller Add a shortcut for finding the common ancestor of two branches a65b656
Commits on Dec 02, 2012
@robmiller Folding changes
- Add PHP folding plugin
- Remap enter to toggle folding
- Set default fold level to all-closed
Commits on Dec 07, 2012
@robmiller Auto-load zmv. 3a43f1a
Commits on Dec 26, 2012
@robmiller Update oh-my-zsh 356362e
@robmiller Add Go syntax 8e2120b
@robmiller Always ignore wp-config files cfd1166
@robmiller Remap toggle-fold to + (still not right though) 9b282d3
@robmiller Always force .md files to Markdown syntax e6320be
Commits on Jan 02, 2013
@robmiller Add vim-sleuth 5b789d8
@robmiller Add vim-speeddating ceb6c5b
@robmiller Add vim-eunuch b1f3c98
Commits on Jan 03, 2013
@robmiller Remove vim-sleuth e471d07
Commits on Jan 13, 2013
@robmiller Kaleidescope changes bed1a57
@robmiller Enable vim's hard mode by default. 643dd4b
@robmiller Remap Y to y$, to make it consistent with C and D b5c0cfe
@robmiller Use the more common Ctrl-L to clear search highlights, rather than <l…
Commits on Jan 14, 2013
@robmiller Upgrade Pathogen to v2.2. c120ab9
Commits on Jan 25, 2013
@robmiller Add command for deleting merged branches. a3b0065
@robmiller Weeks of hard mode have done me good, but its time has passed. 5de1f8a
@robmiller First pass at a ctags file for PHP. ae5fc5a
@robmiller Load Pathogen earlier 70b2ca1
Commits on Jan 27, 2013
@robmiller Add shortcut for Tagbar eef0b18
@robmiller noop 6a3899f
@robmiller Add phpfolding.vim as a submodule 6861ef3
@robmiller Update oh-my-zsh 387c250
@robmiller Update ack.vim 5a3d4dc
@robmiller Update Syntastic 2fee1ea
@robmiller Update tabular b42e52e
@robmiller Update tagbar 7dd7939
@robmiller Update vim-endwise a62c691
@robmiller Update vim-fugitive 471f063
@robmiller Update vim-haml 8827e44
@robmiller Update vim-repeat 55c6d99
@robmiller Update vim-surround 11a05d2
@robmiller Update zencoding 0f0ff5e
@robmiller Better undo file structure.
Instead of storing undo files in the working directory, store them in
a global cache directory instead.
@robmiller Automatically read and write files c003e9f
@robmiller Hide certain files from the file browser 36b64d8
@robmiller Load matchit.vim 7170b77
Commits on Jan 28, 2013
@robmiller *map is evil 8123523
@robmiller Map a localleader too 17b9e8b
@robmiller Add commands for editing and sourcing the vimrc 407c69b
@robmiller Add command for commenting our the current line in PHP/JS 3034f12
@robmiller Add a custom movement for selecting PHP variables 4208d37
Commits on Jan 30, 2013
@robmiller Add vim-movar plugin. c6b2539
Commits on Feb 04, 2013
@robmiller Vim plugin updates. c609e5f
@robmiller Add vim-seek plugin. 9e14620
Commits on Feb 07, 2013
@robmiller Add vim-markdown. f2b619b
Commits on Feb 18, 2013
@robmiller Add vdebug plugin. e76d1fe
Commits on Feb 20, 2013
@robmiller Update oh-my-zsh ce6db89
@robmiller Point Perl 5 lib path to where CPAN installs modules. 30381ee
Commits on Feb 21, 2013
@robmiller Add vim-unimpaired 0883089
@robmiller Add vim-rails plugin. a563024
@robmiller Add vim-bundler plugin. ca2eb87
Commits on Feb 24, 2013
@robmiller Add NERDCommenter cfb3c26
@robmiller Ignore .vimsession files. d8c436a
@robmiller Syntax highlighting for Twig template files. f9a4529
@robmiller PATH changes ee07391
@robmiller Syntax highlight Capfiles. 4caaf6b
@robmiller Use exuberant-ctags by default 5f6d69a
Commits on Mar 01, 2013
@robmiller Better logic for compass_compile function. a56b681
Commits on Mar 04, 2013
@robmiller Final, hopefully, compile_compass function cce24d0
Commits on Mar 09, 2013
@robmiller Add powerline e74860d
Commits on Mar 10, 2013
@robmiller Add ctrl-p. e7f7f17
Commits on Mar 11, 2013
@robmiller Prefer /usr/local/bin in PATH to /usr/bin. fb54be6
@robmiller Add vim-obsession 78c4c72
@robmiller When starting vim, automatically restore a session if there is one 9965121
@robmiller Update oh-my-zsh 87a9abb
@robmiller Remove tpope's vim-obsession 16f30f0
@robmiller Add my own vim-obsession, with autoloading. 96b2184
@robmiller Colours for terminal vim 91cd0cd
@robmiller Syntax highlighting for gitconfig 89c1148
Commits on Mar 12, 2013
@robmiller Mappings for switching tabs fe67488
Commits on Mar 14, 2013
@robmiller Update vim-obsession. ec7f46e
Commits on Mar 19, 2013
@robmiller Use ~ for home in PATH 5f2c6d8
Commits on Mar 22, 2013
@robmiller Add shortcut to copy the last command to the clipboard 2d6b4a6
Commits on Mar 27, 2013
@robmiller Map <CR> to :nohlsearch 2134aad
Commits on Mar 30, 2013
@robmiller Add vim-showmarks 99fd76c
Commits on Apr 06, 2013
@robmiller Explicitly set vim as editor 3a55bef
Commits on Apr 08, 2013
@robmiller RUBYOPT: always show warnings eb0e830
@robmiller ZSH key bindings for editing the command line 0950d90
@robmiller Disable Ruby warnings for Homebrew 785279a
Commits on Apr 09, 2013
@robmiller NERDTree eef451f
Commits on Apr 17, 2013
@robmiller Merge changes
- Don't commit merges by default
- Commands for diffing past merge commits
@robmiller Obey Ruby's style guides 1b984a4
@robmiller Spell check in Git commits 0576f2d
@robmiller Shortcut for Ctrl+P's MRU mode 369ade4
Commits on Apr 20, 2013
@robmiller Add MIT license 305f2cf
Commits on Apr 21, 2013
@robmiller Shortcut alias for reflogs 8fd1fc8
@robmiller If a file exists, source it
This is for anything that can't be checked into Git (e.g. access tokens)
@robmiller Update vim-movar 901c3f1
Commits on Apr 24, 2013
@robmiller Add vim-abolish d4f8e68
@robmiller Use system clipboard 1fd96f0
Commits on Apr 30, 2013
@robmiller Alias for tagging merges as having been reviewed 3b551ab
@robmiller Add ctrlp-funky 2eacee2
@robmiller Change to my fork of Ctrp-funky 743d1f5
Commits on May 06, 2013
@robmiller Add vim-ruby-conque 4d3d868
Commits on May 07, 2013
@robmiller Fix typo 086d95d
Commits on May 12, 2013
@robmiller Add zsh-syntax-highlighting 096a1bc
Commits on May 16, 2013
@robmiller Add CoVim f842b26
@robmiller Update plugins df56c13
@robmiller Update conque URL 0b2c73b
Commits on May 18, 2013
@robmiller Add RubySinatra plugin to Vim bb20a20
@robmiller Remove unused Vim plugins 12e5daf
Commits on May 24, 2013
@robmiller Update oh-my-zsh 8cedf06
Commits on May 29, 2013
@robmiller Commands for publishing, unpublishing, and recreating branches e48ba1e
Commits on Jun 23, 2013
@robmiller Options for Par c1e55e4
@robmiller Add an alias for regenerating ctags 564723e
Commits on Jul 14, 2013
@robmiller Update ctags settings 3a06cc7
@robmiller Alias for updating submodules 7c61119
@robmiller Updates 2c9403c
Commits on Jul 17, 2013
@robmiller rebase-branch alias c1647ac
Commits on Sep 07, 2013
@robmiller Updates 194952f
@robmiller Use a Rakefile for installing a21eece
Commits on Sep 08, 2013
@robmiller Zsh config change ababac0
@robmiller Updates 4a0d30f
@robmiller Updates 353ee44
@robmiller Remove unused Vim plugins 387e65a
Commits on Sep 10, 2013
@robmiller Add "latest" command for showing recently active branches 8b51fea
Commits on Oct 10, 2013
@robmiller Add tcomment and PHP indenting b37ce06
@robmiller Add nscp command
Copies the IP of a hostname to the clipboard
@robmiller Add tmux config file 85d07a7
Commits on Oct 15, 2013
@robmiller Remove vim-seek 333da2b
@robmiller Add vim-sneak fc7a7d6
Commits on Oct 18, 2013
@robmiller Add Airline 33445d4
@robmiller Add vim.csv 4aeb7e3
@robmiller Use powerline fonts with Airline 2f53f65
@robmiller Remove showmarks f1d7cfe
@robmiller Playing with DWM master pane size d7810c7
@robmiller Add Tab2Space and Space2Tab commands 9ce7646
Commits on Oct 23, 2013
@robmiller MORE ZSH PLUGINS!! 7fc051f
Commits on Oct 27, 2013
@robmiller Add Tomorrow theme to Vim aafccd3
Commits on Nov 06, 2013
@robmiller Remove peepopen ef9abd0
Commits on Nov 10, 2013
@robmiller Add vim-rake 199bb76
Commits on Dec 10, 2013
@robmiller Plugin updates 347e6ec
@robmiller Disable VCS dirty tracking in shell prompt
It improves performance a lot, and isn't the end of the world to lose.
@robmiller noop 116b9e9
@robmiller Enable spellchecking in Markdown files 4938c20
@robmiller Tell Signify (VCS status in gutter) to update more regularly 82dd3ce
@robmiller Leader-p shortcut for pasting text from the system clipboard d4e4f9b
@robmiller Add path to the version of Python installed by Homebrew bb26e7b
@robmiller Add npm to path a80e533
@robmiller Tidy up my PATH b8d15e1
@robmiller Remove phpfolding plugin a91c76f
@robmiller Remove vim-ruby-sinatra plugin a0b5701
Commits on Dec 28, 2013
@robmiller Add vim-clojure and vim-liquid plugins fdf0eb0
@robmiller Spelling updates b81609f
@robmiller Vim shortcut for Jekyll highlight blocks 63d7f72
@robmiller Vim shortcut for wordcount on the current file d064303
@robmiller Add vim-vinegar d96e07b
Commits on Jan 08, 2014
@robmiller Add vim rust plugin b8062cb
@robmiller Spelling DB updates 5ca32cb
@robmiller vim-abolish abbreviations ebb3151
Commits on Jan 21, 2014
@robmiller README 650c402
Commits on Jan 22, 2014
@robmiller Add Vim skip 2a3a446
Commits on Jan 27, 2014
@robmiller Spelling database updates e9da844
@robmiller Leader commands for Jekyll 2a2638d
@robmiller Highlight cliches in tech writing 825ea9b
Commits on Jan 30, 2014
@robmiller Add mdcd command for making a directory and changing to it dbdc2c0
Commits on Mar 07, 2014
@robmiller Some settings for git grep 6dcd0da
@robmiller More vim-abolish settings 393f890
@robmiller Shortcut for stripping invalid UTF-8 chars from a file 8461583
@robmiller When piping to source-highlight, use the version in $PATH 3ace7e0
Commits on Mar 09, 2014
@robmiller Use for less syntax highlighting
Also, only do this if exists in the path.
Commits on Mar 12, 2014
@robmiller Shortcut for evaluating the current line as Ruby 4b756f9
Commits on Apr 15, 2014
@robmiller Vim: add :CloneAs 0cd8e0b
@robmiller Vim: add jdaddy plugin for JSON dba1d78
@robmiller Set no_expensive mode in Ruby syntax highlighting 7a7ba5c
@robmiller Better mapping for "highlight just-pasted text" 51541de
@robmiller Shortcut for formatting JSON files f1ce34e
@robmiller oh-my-zsh: add hub plugin 92a5053
@robmiller ZSH: Add REPORTTIME
This makes ZSH display the output of `time` for commands that take
longer than 10 seconds to run.
@robmiller ZSH: `chomp` function
A la Perl and Ruby, trims the final whitespace character from a string.
@robmiller ZSH: `indent` function for indenting text
I use this when I want to copy a file/some text for use as a code block
in a Markdown document, e.g.:

	% cat foo.rb | indent | pbcopy
@robmiller ZSH: add `cpsrc` command
This copies the source of a file, indented for use in Markdown
@robmiller ZSH: more `ls` aliases
- lsd: list directories
- ls-today: list files modified today
@robmiller ZSH: Alias `hub` to `git` 42a032e
Commits on May 15, 2014
@robmiller Add vim plugins: Copy as RTF, XMPFilter 54a6109
@robmiller Vim spelling updates f105986
@robmiller XMPFilter leader commands for Vim 67b7a8d
@robmiller neocomplcache install b6b5f0c
@robmiller Remove old neocomplcache 51fb5c2
@robmiller Add new neocomplcache d3552f9
Commits on May 16, 2014
@robmiller Remove Tabular 6f9c1c6
@robmiller Add Align plugin and configuration 46c3ad4
@robmiller vimrc clearout
- Remove unused plugins
- Remove crufty config
- Some reordering
Commits on May 22, 2014
@robmiller Add vim-dispatch 4b1718c
Commits on May 28, 2014
@robmiller Update vim-dwm 5fd6b44
@robmiller Inline- and extract-variable macros
From Gary Bernhardt's vimrc
@robmiller Remove copy-as-rtf plugin 69875c8
@robmiller Shorter mappings for moving between windows 497a177
Commits on Jun 06, 2014
@robmiller cdl = cd to most-recently-modified directory e34c80b
@robmiller Load ~/.aws, containing AWS creds as env vars 787bdcc
Commits on Jun 10, 2014
@robmiller Add vim-swift plugin cdbf86f
Commits on Jun 30, 2014
@robmiller Git: add --show-linear-break to default log alias 943146b
@robmiller Git: don't futilely try to alias builtins 59f6e81
@robmiller merge-feature and stage-feature aliases
For merging the current topic branch into master and staging
respectively. Updates the target branch first to make sure you'll be
able to push.
@robmiller Plugin updates f172d17
Commits on Jul 04, 2014
@robmiller Shorten compile_compass command to cc
Because I can never remember whether it's compile_compass or
@robmiller Spelling database updates f5632e6
Commits on Jul 11, 2014
@robmiller Spelling updates 472e878
@robmiller Git: add alias for finding branches with Selecta b4e442a
@robmiller Add alias for fuzzy finding then tracking a new remote branch 89da659
Commits on Jul 16, 2014
@robmiller Vim: %% alias in command line mode 191caba
@robmiller Vim: better window settings
- Shrink horizontal splits to five lines, apart from the active window
  which will fill the remaining space
- Make sure active vertical splits are at least 84 characters wide
@robmiller Vim: remove php-indenting plugin 1e8e33a
@robmiller Vim: add PHP indenting plugin 7a8ddb3
Commits on Jul 29, 2014
@robmiller Vim: PHP syntax update 65e05b4
@robmiller Vim: when using tab to close autocomplete, actually insert a tab 3ae355b
@robmiller Remove neocomplcache temporarily b3fb003
@robmiller Upgrade Pathogen 9957c64
@robmiller Only configure neocomplcache if it exists 2b5d16b
@robmiller Vim: remove DWM e863e92
Commits on Aug 04, 2014
@robmiller Add vim-pl plugin c1e5059
@robmiller Add vim-ragtag 2803ac0
Commits on Nov 22, 2014
@robmiller General purpose scripts a11387d
Commits on Dec 08, 2014
@robmiller Varnish support in Vim 1749858
Commits on Jun 15, 2015
@robmiller Add vim-chef a018bf5
@robmiller Add vim cucumber 465cafb
@robmiller Add vim-rvm ddb9b79
@robmiller Vim plugin additions a56f425
@robmiller Plugin updates dfce45a
Commits on Jul 14, 2015
@robmiller Add vim-lotus a6a6776
@robmiller Add vim-ruby-fold aac8c18
Commits on Oct 28, 2015
@robmiller Add psql configuration
For the Postgres command-line.
@robmiller New Java version b83c7b6
@robmiller Shell: load a config file that isn't Git-controlled
So I can put things like environment variables in it
@robmiller Spelling dictionary updates 3a90881
@robmiller Plugin updates c284c50
Commits on Jan 06, 2016
@robmiller Update less source highlight location 39ab735
Commits on Jan 07, 2016
@robmiller Script for figuring out anagrams fa93e3e
Commits on Mar 18, 2016
@robmiller Vim: Blade template file syntax highlighting 291742f
@robmiller rm chef bf189e8
@robmiller Script for converting TSV files to CSV files d30d516
@robmiller Script for enabling root access on a Rackspace DB instance 780479a
Commits on Mar 30, 2016
@robmiller Add Vim plugin for Ansible 8595a4f