From 97c768edcd4d9240982b4f6d40adcb18f80cef0b Mon Sep 17 00:00:00 2001
From: Kostas Lekkas <kostas@lekkas.io>
Date: Wed, 20 Jul 2016 16:53:41 +0300
Subject: [PATCH] resin sync: add --skip-gitignore option. Improve help section
 wording

---
 lib/actions/sync.coffee | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/lib/actions/sync.coffee b/lib/actions/sync.coffee
index 4b7c0b6a..4a546a82 100644
--- a/lib/actions/sync.coffee
+++ b/lib/actions/sync.coffee
@@ -61,13 +61,12 @@ module.exports =
 			ignore:
 				- .git
 				- node_modules/
-			progress: true
-			verbose: false
 
-		Notice that explicitly passed command options override the ones set in the configuration file.
+		Command line options have precedence over the ones saved in '.resin-sync.yml'.
 
-		Also, if '.gitignore' is found in the source directory then all explicitly listed files will be
-		excluded from the syncing process.
+		If '.gitignore' is found in the source directory then all explicitly listed files will be
+		excluded from the syncing process. You can choose to change this default behavior with the
+		'--skip-gitignore' option.
 
 		Examples:
 
@@ -94,21 +93,25 @@ module.exports =
 			parameter: 'paths'
 			description: 'comma delimited paths to ignore when syncing'
 			alias: 'i'
+		,
+			signature: 'skip-gitignore'
+			boolean: true
+			description: 'do not parse excluded/included files from .gitignore'
 		,
 			signature: 'before'
 			parameter: 'command'
 			description: 'execute a command before syncing'
 			alias: 'b'
-		,
-			signature: 'progress'
-			boolean: true
-			description: 'show progress'
-			alias: 'p'
 		,
 			signature: 'port'
 			parameter: 'port'
 			description: 'ssh port'
 			alias: 't'
+		,
+			signature: 'progress'
+			boolean: true
+			description: 'show progress'
+			alias: 'p'
 		,
 			signature: 'verbose'
 			boolean: true