Update deps and improve default git command

Author: rtfpessoa

package.json

@@ -50,19 +50,19 @@
   "main": "./src/main.js",
   "dependencies": {
     "copy-paste": "^1.3.0",
-    "diff2html": "^2.0.8",
+    "diff2html": "^2.0.11",
     "extend": "^3.0.0",
     "open": "^0.0.5",
-    "request": "^2.75.0",
-    "yargs": "^6.1.1"
+    "request": "^2.79.0",
+    "yargs": "^6.5.0"
   },
   "devDependencies": {
     "codacy-coverage": "^2.0.0",
-    "eslint": "^3.8.0",
-    "eslint-plugin-promise": "^3.0.0",
+    "eslint": "^3.12.2",
+    "eslint-plugin-promise": "^3.4.0",
     "eslint-plugin-standard": "^2.0.1",
     "istanbul": "^0.4.5",
-    "mocha": "^3.1.2"
+    "mocha": "^3.2.0"
   },
   "license": "MIT",
   "files": [

src/cli.js

@@ -48,7 +48,7 @@
         return '"' + arg + '"'; // wrap parameters
       }).join(' ');
     } else {
-      gitArgs = '-M HEAD';
+      gitArgs = '-M -C HEAD';
     }
 
     var diffCommand = 'git diff ' + gitArgs;

src/main.js

@@ -13,6 +13,8 @@ var utils = require('./utils.js').Utils;
 
 var yargs = require('yargs');
 
+var currentYear = new Date().getFullYear();
+
 var argv = yargs.usage('Usage: diff2html [options] -- [diff args]')
   .options({
     's': {
@@ -30,7 +32,7 @@ var argv = yargs.usage('Usage: diff2html [options] -- [diff args]')
       describe: 'Synchronised horizontal scroll',
       type: 'string',
       choices: ['enabled', 'disabled'],
-      default: 'enabled'
+      default: 'disabled'
     }
   })
   .options({
@@ -49,7 +51,7 @@ var argv = yargs.usage('Usage: diff2html [options] -- [diff args]')
       nargs: 1,
       type: 'string',
       choices: ['lines', 'words', 'none'],
-      default: 'words'
+      default: 'none'
     }
   })
   .options({
@@ -67,7 +69,7 @@ var argv = yargs.usage('Usage: diff2html [options] -- [diff args]')
       describe: 'Diff line matching maximum line comparisons of a block of changes',
       nargs: 1,
       type: 'string',
-      default: '2500'
+      default: '1000'
     }
   })
   .options({
@@ -138,7 +140,8 @@ var argv = yargs.usage('Usage: diff2html [options] -- [diff args]')
   })
   .help('h')
   .alias('h', 'help')
-  .epilog('© 2014-2016 rtfpessoa\n' +
+  .epilog('© 2014-' + currentYear + ' rtfpessoa\n' +
+    'For more information, check out https://diff2html.xyz/\n' +
     'For support, check out https://github.com/rtfpessoa/diff2html-cli')
   .argv;