Skip to content
Commits on Oct 16, 2015
  1. @seanpdoyle

    Add `git pf` alias

    Using `--force-with-lease` allows one to force push without the risk of
    unintentionally overwriting someone else's work.
    
    The git-push(1) man page states:
    
    > Usually, "git push" refuses to update a remote ref that is not an
    > ancestor of the local ref used to overwrite it.
    >
    > This option overrides this restriction if the current value of the
    > remote ref is the expected value. "git push" fails otherwise.
    >
    > --force-with-lease alone, without specifying the details, will protect
    > all remote refs that are going to be updated by requiring their
    > current value to be the same as the remote-tracking branch we have for
    > them.
    >
    > --@calleerlandsson
    > -- thoughtbot/guides#363
    seanpdoyle committed Oct 16, 2015
  2. @geoffharcourt

    Remove zsh `jj` keybinding

    As reported in #405, the `jj` keybinding is problematic for some users
    as it enters vi-mode whenever a user types a string that actually
    contains two consecutive `j`s.
    
    While consecutive `j`s are unusual in English, usernames with
    consecutive `j`s such as that of the contributor who reported the
    problem (@jjlangholtz) are common enough that we shouldn't force this
    mapping on users.
    
    Users can add their own keybinding to their local configuration or use
    the already-provided `Esc` binding to enter vi-mode.
    
    PR #405 contains other keybinding changes that we don't want to apply,
    this commit addresses only the `jj` binding.
    geoffharcourt committed Oct 16, 2015
  3. @codenamev @geoffharcourt
Commits on Oct 9, 2015
  1. @mike-burns

    Remove unused Easter egg

    The `ranch` subcommand is annoying to skip and adds clutter to our
    system, which only encourages people not to use our dotfiles as a base.
    Remove it to get customizability back.
    mike-burns committed Oct 9, 2015
  2. @JoelQ

    Add custom git command `git ranch`

    Sometimes when typing `git branch` I leave off the leading `b`, leading
    to the boring message:
    
    > git: 'ranch' is not a git command. See 'git --help'.
    
    This adds a custom `git ranch` command with a friendlier funny message.
    JoelQ committed Sep 3, 2015
Commits on Oct 8, 2015
  1. @andyw8

    Clarify integration with Exuberant Ctags

    The ctags.vim plugin was removed in #375. I updated the README to
    document the Vim mapping for re-indexing a project's ctags.
    andyw8 committed Sep 13, 2015
Commits on Oct 3, 2015
  1. @geoffharcourt

    Use vim-projectionist and vim-rake

    vim-projectionist provides vim-rails-like shortcuts for alternate and
    related files. It allows users to provide a custom set of "projections"
    that map filetypes to their alternate and related counterparts. Custom
    mappings can be declared in a JSON-like syntax.
    
    This change provides authors of gems and other non-Rails Ruby projects
    with access to the alternate file `:A` shortcuts to navigate between
    code and specs. vim-rake automatically maps code/spec mappings for Ruby
    files if vim-projectionist is available.
    
    Close #381.
    geoffharcourt committed Oct 3, 2015
  2. @geoffharcourt

    Merge pull request #424 from zillou/readme-command-fix

    Fix syntax for OS X path_helper directions in README
    geoffharcourt committed Oct 3, 2015
  3. @zillou

    Fix a command in README

    zillou committed Oct 3, 2015
Commits on Oct 2, 2015
  1. @geoffharcourt

    Add instructions to fix path on OS X El Capitan

    OS X 10.11 changes the file where `path_helper` is invoked from
    `/etc/zshenv` to `/etc/zprofile`. The change results in `path_helper`
    rearranging the path in such a way that interferes with path changes
    made in `.zshenv`.
    
    This README update instructs users to rename `/etc/zprofile` to
    `/etc/zshenv` so that `.zshenv` (and `.zshenv.local`) will be loaded
    *after* `path_helper` is called, maintaining the desired precedence of
    paths.
    
    Thanks to @reshleman and @ventsislaf for investigating and offering
    solutions.
    Geoff Harcourt committed with geoffharcourt Oct 2, 2015
  2. @croaky
Commits on Aug 25, 2015
  1. @geoffharcourt

    Update README to advise running `rcup` after update

    In #408 a user reported errors after pulling down master and opening
    Vim without having run `rcup`. This documentation change updates the
    section on `rcup` to advise running the command after pulling from the
    origin.
    
    Other changes:
    * Removed outdated references to `m` and `rk` aliases, which have been
      removed from the repository.
    * Added reference to `migrate` alias, which remains in the repository.
    geoffharcourt committed Aug 25, 2015
Commits on Jul 29, 2015
  1. @timfenney
Commits on Jul 12, 2015
  1. @blainesch
Commits on Jul 4, 2015
  1. @CodingFu

    Update README.md

    CodingFu committed Jul 4, 2015
Commits on Jun 15, 2015
  1. @derekprior

    Ignore "useless use of variable in void context"

    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.
    derekprior committed Jun 15, 2015
Commits on May 26, 2015
  1. @gylaz

    Add third-party site-functions to $fpath

    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 thoughtbot#373.
    gylaz committed May 22, 2015
  2. @gylaz

    Remove uncommon aliases

    gylaz committed May 8, 2015
Commits on May 22, 2015
  1. @tute

    Use C-s as tmux prefix

    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-\.
    tute committed May 18, 2015
  2. @gylaz

    Added git_template/info/exclude for Xcode

    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
    Dean Tambling committed with gylaz Apr 21, 2015
  3. @jacquerie @gylaz

    Add "^K" keybind

    Bind "^K" to the kill-line command.
    jacquerie committed with gylaz May 13, 2015
  4. @danielnolan @gylaz

    Source matchit.vim from vim/macros directory

    * After removing the matchit.vim plugin from the vimrc.bundles file in
      this pull request thoughtbot#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
    danielnolan committed with gylaz May 11, 2015
Commits on May 16, 2015
  1. @graysonwright @graysonwright

    Update tat script to accept optional session name

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

    Update README to use vim-plug syntax

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

    Update shim that helps migrate to vim-plug

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

    Remove ctags.vim plugin

    The plugin seems abandoned and doesn't work with our setup as it is.
    gylaz committed May 1, 2015
  3. @derekprior @gylaz

    Add "bundle search" subcommand

    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.
    derekprior committed with gylaz Mar 13, 2015
  4. @danielnolan @gylaz

    Remove matchit.zip plugin

    * 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
    danielnolan committed with gylaz May 6, 2015
  5. @seanpdoyle

    Exclude `node_modules` and `bower_components`

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

    Enable Git's autosquash feature by default.

    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.
    georgebrock committed May 2, 2015
Commits on Apr 27, 2015
  1. @geoffharcourt

    Use vim-plug over vundle

    [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)
    geoffharcourt committed Feb 18, 2015
  2. @croaky

    Move Git aliases to subcommand scripts

    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
    croaky committed Apr 11, 2015
Commits on Apr 9, 2015
  1. @gylaz
  2. @andyw8 @gylaz

    Enable autocomplete with dictionary words

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

    Remove GitHub colorscheme

    * 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
    jessieay committed Mar 12, 2015
Something went wrong with that request. Please try again.