Permalink
Commits on Sep 2, 2017
  1. Merge pull request #166 from MainShayne233/master

    JCook21 committed on GitHub Sep 2, 2017
    Enhancement/Add 'to' to error message.
  2. Add 'to' to error message.

    Shayne Tremblay committed Sep 2, 2017
Commits on Aug 28, 2017
  1. Merge pull request #164 from fuzzbomb/update-README-symlink-command

    JCook21 committed on GitHub Aug 28, 2017
    Rename symlink command to link in README.
Commits on Jun 12, 2017
  1. Rename symlink command to link in README.

    fuzzbomb committed Jun 12, 2017
    symlink command was previously renamed to link, but references in the README
    were not updated.
Commits on Mar 23, 2017
  1. Merge pull request #161 from philoserf/patch-1

    JCook21 committed on GitHub Mar 23, 2017
    Update ChangeLog.markdown
  2. Update ChangeLog.markdown

    philoserf committed on GitHub Mar 23, 2017
    Add the space that markdown requires between the header marker `#` and the header text.
Commits on Mar 22, 2017
Commits on Mar 20, 2017
  1. Merge pull request #159 from mruwek/refactor-conflict-actions

    JCook21 committed on GitHub Mar 20, 2017
    Wrap symlink and regular conflicts into one case
  2. Wrap symlink and regular conflicts into one case

    mruwek committed Mar 20, 2017
    This way we're not duplicating collision-related code.
  3. Merge pull request #157 from mruwek/verbose-symlink-conflicts

    JCook21 committed on GitHub Mar 20, 2017
    Don't overwrite silently on symlink conflicts
  4. Merge pull request #154 from singular0/symlink_realpath

    JCook21 committed on GitHub Mar 20, 2017
    Use real paths of symlinks when linking castle into home
  5. Merge pull request #158 from JCook21/master

    JCook21 committed on GitHub Mar 20, 2017
    Minor updates
Commits on Mar 19, 2017
  1. Update to dependency.

    JCook21 committed Mar 19, 2017
Commits on Mar 17, 2017
  1. Don't overwrite silently on symlink conflicts

    mruwek committed Mar 17, 2017
    Symlink conflicts are now handled in similar fashion as normal
    file-conflicts.
Commits on Dec 26, 2016
  1. Merge pull request #155 from danielbayerlein/ruby-2.4.0

    JCook21 committed on GitHub Dec 26, 2016
    Add support for Ruby 2.4.0
Commits on Dec 25, 2016
Commits on Dec 24, 2016
  1. Merge pull request #152 from singular0/master

    JCook21 committed on GitHub Dec 24, 2016
    Thanks for taking care of this.
  2. Remove config for removed ruby versions.

    JCook21 committed on GitHub Dec 24, 2016
    Deleted config for unused ruby versions.
  3. Merge branch 'master' into master

    JCook21 committed on GitHub Dec 24, 2016
  4. Merge pull request #153 from danielbayerlein/ruby-version

    JCook21 committed on GitHub Dec 24, 2016
    Looks good to me, thanks!
Commits on Dec 23, 2016
  1. Update RSpec

    danielbayerlein committed Dec 23, 2016
Commits on Dec 5, 2016
Commits on Dec 3, 2016
Commits on Jan 22, 2016
  1. Merge pull request #149 from mail6543210/master

    JCook21 committed Jan 22, 2016
    Use source content instead of source path (fixes: #148). Thanks for fixing this!