Skip to content

Commit

Permalink
Merge pull request #17 from joshuay03/update-force-polling-flag
Browse files Browse the repository at this point in the history
Make it clear that `--force-polling` is just for master
  • Loading branch information
ghiculescu authored Jan 16, 2024
2 parents 003e5d9 + 6fb8955 commit a7c50c0
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ Options:
All paths should be relative to the base sync directory.
-p, --port PORT Overwrite the SSH port (usually 22)
(doesn't do anything in slave mode)
--force-polling Forces the use of the listen polling adapter
(works cross-platform, generally slower, doesn't do anything in slave mode)
--no-rvm Skip attempting to load RVM on remote
-v, --verbose Log Debug lines
-q, --quiet Don't log to stdout in master process
Expand Down
5 changes: 3 additions & 2 deletions exe/entangler
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ OptionParser.new do |opts|
opts.separator 'Options:'

opts.on('-i', "--ignore '.git'", "Ignore path when syncing, string is regex if surrounded by '/'",
'All paths should be relative to the base sync directory.') do |ignore|
'All paths should be relative to the base sync directory') do |ignore|
options[:ignore] ||= []
options[:ignore] << ignore
end
Expand All @@ -41,7 +41,8 @@ OptionParser.new do |opts|
"(doesn't do anything in slave mode)")

bool_opt(options, opts, :force_polling, '--force-polling',
'Forces the use of the listen polling adapter (works cross-platform, generally slower)')
'Forces the use of the listen polling adapter',
"(works cross-platform, generally slower, doesn't do anything in slave mode)")

bool_opt(options, opts, :no_rvm, '--no-rvm', 'Skip attempting to load RVM on remote')

Expand Down
2 changes: 1 addition & 1 deletion lib/entangler/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true

module Entangler
VERSION = '1.4.0'
VERSION = '1.4.1'
end

0 comments on commit a7c50c0

Please sign in to comment.