Jeremy Cook
|
fdb57cd846
|
Apply fixes suggested by Rubocop.
|
2019-01-19 11:50:20 -05:00 |
|
Jeremy Cook
|
f09c62d922
|
Minor fixes suggested by rubocop.
|
2019-01-18 23:32:31 -05:00 |
|
Jacek Sowiński
|
6590a1eeff
|
Wrap symlink and regular conflicts into one case
This way we're not duplicating collision-related code.
|
2017-03-20 20:26:14 +01:00 |
|
Jeremy Cook
|
693ae5f05e
|
Merge pull request #157 from mruwek/verbose-symlink-conflicts
Don't overwrite silently on symlink conflicts
|
2017-03-19 22:02:41 -04:00 |
|
Jacek Sowiński
|
85f46e01b1
|
Don't overwrite silently on symlink conflicts
Symlink conflicts are now handled in similar fashion as normal
file-conflicts.
|
2017-03-17 19:31:23 +01:00 |
|
Denis Yantarev
|
5614b6b8b3
|
Use real paths of symlinks when linking castle into home
|
2016-12-25 18:34:33 +03:00 |
|
Jeremy Cook
|
978416d1e4
|
Fixing diff problems by providing source block and checking for
directories in diff
|
2015-10-20 21:47:43 -04:00 |
|
Jeremy Cook
|
7632591681
|
Coding standards fixes based off of Rubocop and minor edits to make
logic flow easier to understand.
|
2015-10-12 19:30:29 -04:00 |
|
William Boman
|
fb7595d254
|
Escape message correctly on git_commit_all.
|
2015-02-19 16:51:53 +01:00 |
|
Jeremy Cook
|
46faec7857
|
Bug fix to make sure git check works properly.
|
2015-01-01 21:21:27 -05:00 |
|
Jeremy Cook
|
03490531d8
|
Changed name of git check method to be more descriptive.
|
2014-11-24 08:49:17 -05:00 |
|
Jeremy Cook
|
7bd9759e81
|
Added tests for a minimumGit version of 1.8.0.
|
2014-11-23 22:22:44 -05:00 |
|
Jeremy Cook
|
a808f56caf
|
Tightened up git checking to check for a minimum installed version of
Git.
|
2014-11-23 14:32:47 -05:00 |
|
Jeremy Cook
|
1a44edcde1
|
Merge pull request #111 from JCook21/Pretend
Edits to keep code DRY
|
2014-04-26 17:45:08 -04:00 |
|
Jeremy Cook
|
f55828f1d4
|
Fixing a bug that breaks the handling of collisions.
|
2014-04-22 20:54:05 -04:00 |
|
Jeremy Cook
|
d4f9633a0c
|
Added ability for methods to be overrode, through the pretend and quiet
options, skipping their default behaviour if so.
|
2014-04-22 19:43:40 -04:00 |
|
Nicolas McCurdy
|
d9ee74bf14
|
Move GitActions and FileActions into a new Actions module
|
2014-04-16 20:54:26 -04:00 |
|