Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Jul 12, 2015
  1. @blainesch
Commits on Jul 4, 2015
  1. @CodingFu

    Update README.md

    CodingFu authored
Commits on Jun 15, 2015
  1. @derekprior

    Ignore "useless use of variable in void context"

    derekprior authored
    The following ERB generates a "Possibly useless use of variable in void
    context" warning from Syntastic:
    
    ```erb
    <%= comment %>
    ```
    
    The warning can be eliminated by making it:
    
    ```erb
    <%= comment.to_s %>
    ```
    
    However, this behavior is the default and is redundant. There are other
    cases where this warning pops up and in each case I've found it to be of
    no use.
Commits on May 26, 2015
  1. @gylaz

    Add third-party site-functions to $fpath

    gylaz authored
    Third-party completions get added to
    `/usr/local/share/zsh/site-functions`.
    
    Standard `$fpath` contains `/usr/share/zsh/site-functions`
    (not the missing `local`).
    
    By adding this to the `$fpath` git subcommands get completed correctly.
    Related to #373.
  2. @gylaz

    Remove uncommon aliases

    gylaz authored
Commits on May 22, 2015
  1. @tute

    Use C-s as tmux prefix

    tute authored
    C-a allow use to trigger tmux prefix more easily than C-b, at the cost
    of overriding the readline beginning of line. This change remaps it to
    C-s, which has the same effect without that drawback.
    
    Remove last-pane bindings.
    Map prefixes to underlying behavior
    
    Quoting Chris Toomey:
    
    > I'm wondering if we might want to take a different approach with these
    > keys. last-pane is already bound to ; by default which is comfortably
    > on the home row, and if using vim-tmux-navigator also bound to
    > (unprefixed) C-\.
  2. @gylaz

    Added git_template/info/exclude for Xcode

    Dean Tambling authored gylaz committed
    Xcode >=6.0.1 throws an error when creating a new git-tracked project
    without an 'exclude' file. Created the exclude file to correspond to
    the existing gitignore file.
    
    More info about this file:
    http://seejohncode.com/2012/02/29/git-info-exclude
  3. @jacquerie @gylaz

    Add "^K" keybind

    jacquerie authored gylaz committed
    Bind "^K" to the kill-line command.
  4. @danielnolan @gylaz

    Source matchit.vim from vim/macros directory

    danielnolan authored gylaz committed
    * After removing the matchit.vim plugin from the vimrc.bundles file in
      this pull request #379. It
      was brought to my attention that plugins in the macros directory are
      not automatically loaded due to backwards compatibility issues.
    * Add entry to vimrc to source the matchit.vim plugin from the macros
      directory, if the user does not have it installed already. This is how
      Tim Pope adds the matchit.vim plugin to vimrc in his vim-sensible plugin.
      https://github.com/tpope/vim-sensible/blob/master/plugin/sensible.vim#L88
Commits on May 16, 2015
  1. @graysonwright

    Update tat script to accept optional session name

    graysonwright authored graysonwright committed
    If no session name is provided,
    it will generate one from the current directory.
Commits on May 12, 2015
  1. @shamanime

    Update README to use vim-plug syntax

    shamanime authored
    The examples were using the vundle syntax instead.
Commits on May 8, 2015
  1. @joshleichtung @gylaz

    Update shim that helps migrate to vim-plug

    joshleichtung authored gylaz committed
    Improve the shim to catch both `Plugin` and `Bundle` commands
    for users that are still using Vundle's older syntax.
  2. @gylaz

    Remove ctags.vim plugin

    gylaz authored
    The plugin seems abandoned and doesn't work with our setup as it is.
  3. @derekprior @gylaz

    Add "bundle search" subcommand

    derekprior authored gylaz committed
    Bundler 1.8+ added support for git-style subcommands. Any scripts
    starting with `bundler-` in your path are executable as bundler
    subcommands.
    
    This adds `search` as a subcommand that uses `ag` to search for a string
    among all gems in your bundle (default) or optionally a specific gem.
    I've found this useful for finding the source of puzzling deprecations,
    finding what gem provides a method, and other various things.
  4. @danielnolan @gylaz

    Remove matchit.zip plugin

    danielnolan authored gylaz committed
    * This plugin is no longer maintained and is included in vim by default.
    * Per the docs at https://github.com/vim-scripts/matchit.zip
      Since vim 6.0, matchit.vim has been included in the standard vim distribution,
      under the macros/ directory; the version here may be more recent.
    * The version included in the vim macros directory is the same version
      being added in the vimrc.bundles file from github version 1.13.2
  5. @seanpdoyle

    Exclude `node_modules` and `bower_components`

    seanpdoyle authored
    This is equivalent to excluding `vendor/assets` in a Rails project.
    
    JS Dependency trees (especially npm packages) can be extremely noisy.
Commits on May 3, 2015
  1. @georgebrock

    Enable Git's autosquash feature by default.

    georgebrock authored
    Autosquash makes it quicker and easier to squash or fixup commits during an
    interactive rebase. It can be enabled for each rebase using `git rebase -i
    --autosquash`, but it's easier to turn it on by default.
    
    Say I have this history:
    
        $ git log --oneline
        aaa1111 A first commit
        bbb2222 A second commit
        ccc3333 A third commit
    
    I make another change that I already know should be squashed into "A
    second commit". I can do this:
    
        $ git add .
        $ git commit --squash bbb2222
        [my-branch ddd4444] squash! A second commit
    
    Then when I rebase:
    
        $ git rebase -i origin/my-branch
    
    The interactive rebase list will be set up ready to squash:
    
        pick aaa1111 A first commit
        pick bbb2222 A second commit
        squash ddd4444 squash! A second commit
        pick ccc3333 A third commit
    
    Since it's unlikely that anyone will be writing a commit message that begins
    `squash!` or `fixup!` when they don't want this behaviour, and the user
    still has a chance to review what's going to happen with the rebase, it's
    safe to have it always turned on.
Commits on Apr 27, 2015
  1. @geoffharcourt

    Use vim-plug over vundle

    geoffharcourt authored
    [vim-plug](https://github.com/junegunn/vim-plug) has a number of
    advantages over Vundle:
    
    * Installs and updates plugins very quickly in parallel
    * Can lock plugins at versions/tags
    * Can rollbacks updates (useful if a plugin breaks) and take/reload
      snapshots of current state
    * Optionally lazily-load plugins when their relevant command is invoked
    * Execute post-update hooks for plugins with compiled extensions, etc.
    
    vim-plug uses a DSL very close to Vundle (simplest form is `Plug` vs.
    `Plugin`), and here it is set to continue to use the same plugin
    location that Vundle was using before.
    
    After updating, users will need to
    1. Rename `Plugin` lines in `.vimrc.bundles.local` to use `Plug`
    2. Run `:PlugInstall` (the post-up hook does this)
  2. @croaky

    Move Git aliases to subcommand scripts

    croaky authored
    Any executable script on you PATH
    that is named `git-some-name`
    will be available as a git subcommand,
    which means you could do `git some-name` to run the script.
    
    Git adds them to `git help -a` under the title
    "git commands available from elsewhere on your $PATH",
    which will then power the auto completion,
    so that will also work for any command you add.
    
    http://blog.zamith.pt/blog/2014/11/05/supercharging-your-git/
    
    Examples of other projects that structure their dotfiles like this:
    
    https://github.com/robbyrussell/oh-my-zsh
    https://github.com/tj/git-extras
    https://github.com/holman/dotfiles
Commits on Apr 9, 2015
  1. @gylaz
  2. @andyw8 @gylaz

    Enable autocomplete with dictionary words

    andyw8 authored gylaz committed
    Enable autocomplete with dictionary words when
    spell check is on.
Commits on Mar 18, 2015
  1. @jessieay

    Remove GitHub colorscheme

    jessieay authored
    * Every time I pull updates from this repo into my own dotfiles, I have to
      reconfigure my preferred theme (solarized)
    * Seems like there is not a majority or plurality of thoughbotters using a
      single colorscheme
    * Easiest to just not specify a colorscheme
    * See https://forum.upcase.com/t/why-is-the-default-vim-theme-on-dotfiles-is-github/4232
Commits on Mar 13, 2015
  1. @derekprior

    Let ctrl-p find files with a leading dot

    derekprior authored
    I am constantly forgetting that I can't use `ctrl-p` to open
    `.travis.yml` or any other file with a leading `.`. This change comes
    about after some discussion in general on how to handle this. Passing
    `--hidden` to the `ag` command allows it to find files with a leading
    `.`.
    
    Unfortunately, this also includes the content of your `.git`
    directory. To overcome this, we add `/.git/` to `agignore`.
Commits on Mar 9, 2015
  1. @jferris

    Update credits

    jferris authored
    * Break up credits section into thanks/about
    * Use new "About thoughtbot" section
Commits on Feb 24, 2015
  1. @joshhartigan @gylaz

    remove `set nocompatible`

    joshhartigan authored gylaz committed
    It is not needed - see http://vimdoc.sourceforge.net/htmldoc/options.html#'nocompatible';
    (or see :help 'cp')
Commits on Feb 23, 2015
  1. @NewAlexandria @gylaz

    set --nocolor flag to make piping xargs safe

    NewAlexandria authored gylaz committed
  2. @blainesch

    Add the `-v` flag to `commit --amend`.

    blainesch authored
    This allows us to always see things we are going to commit, even if we
    are amending.
Commits on Feb 20, 2015
  1. @iwz

    Add `git branches` command

    iwz authored
    * Lists all remote branches
    * Sorts by last commit date, descending
    * Shows how long the branch has been around
    * Shows last commit author
    
    ```
    $ git branches
    6 days ago  Dan Croak  origin/HEAD
    6 days ago  Dan Croak  origin/master
    5 months ago  Dan Croak  origin/dc-rbenv-zsh
    6 months ago  Sean Doyle  origin/sd-nvm-path
    6 months ago  Tute Costa  origin/vim-multiple-cursors
    7 months ago  Sean Doyle  origin/sd-vundle
    8 months ago  Sean Griffin  origin/sg-disable-spring
    9 months ago  Mike Burns  origin/mb-experimental-tag
    ```
Commits on Feb 18, 2015
  1. @croaky

    Switch from gh to hub

    croaky authored
    * `hub` is the official GitHub client.
    * Like `gh`, `hub` 2.2.0 now powered by the Go programming language.
      https://github.com/github/hub/releases/tag/v2.2.0
    * It has been bottled in Homebrew.
      Homebrew/homebrew@1ad37e4
    * We are using it in the Laptop script.
      thoughtbot/laptop@9fe038c
Commits on Feb 12, 2015
  1. @lunohodov

    Prevent unreadable prompt within Git repository

    lunohodov authored
    When within a git repository, doing a tab-autocomplete on a command results with the command becoming unreadable. The command still works but this is pretty annoying visually.
    
    Basically I
    
    1. Navigate to a directory with a git repository in it. The prompt indicates the current branch properly
    2. Next, type `git -` and hit tab
    
    The prompt now shows only part of branch's name with the first suggestion appended.
    
    After googling a bit I stumbled upon several pages describing a similar problem (most useful to me was http://stackoverflow.com/questions/23740862/issues-with-zsh-prompt).
    
    The culprit seems to be the git_prompt_info function escaping the `$current_branch` variable as if it is a color. As a result zsh is confused where the cursor is. After "unescaping" the variable everything seems to work fine.
    
    Using zsh 5.0.7 (x86_64-apple-darwin13.4.0).
Commits on Feb 9, 2015
  1. @danielnolan @gylaz

    Stop ag from excluding directories with ds_store

    danielnolan authored gylaz committed
    * Silver searcher or ag was filtering out any directory that had a
      .DS_STORE file. Any directory that has a .DS_STORE file in it is being
      ignored by ag and therefor does not show up in the ctrlp fuzzy finder
      either.
    * Removing the * from before .DS_STORE in the gitignore
      file still prevents .DS_STORE files from being checked into source
      control and stops ag from filtering out the directory. I am not sure
      if this is a bug with silver_searcher or what
Commits on Feb 3, 2015
  1. @reshleman

    Don't interpolate environment variables in aliases

    reshleman authored
    A few aliases contain references to environment variables, but were
    defined using double quotes. This caused zsh to interpolate the value of
    those variables when the alias was defined instead of when it was
    executed. In particular, any change to `PATH` (or `EDITOR` or `VISUAL`)
    in `.zshrc.local`, which is sourced after `.aliases`, would not be
    reflected in these aliases.
    
    This commit defines these aliases using single quotes so that the
    environment variables are evaluated when the alias is executed.
Commits on Jan 26, 2015
  1. @croaky

    Add `git rename-branch` alias

    croaky authored
    * Extract `git current-branch` alias.
    * Re-use `git current-branch` in two places.
Commits on Jan 13, 2015
  1. @geoffharcourt

    Remove outdated references to `Rnavcommand`

    geoffharcourt authored
    `Rnavcommand` has been removed from rails.vim. These commands don't work
    if you are using a recent version of the plugin. Users who want to
    regain this functionality can do it through projections.
Commits on Dec 19, 2014
  1. @derekprior

    Add alias for pretty-printing $PATH

    derekprior authored
    I've had a number of issues with $PATH of late and I kept using this to
    make it readable (and comparable).
Something went wrong with that request. Please try again.