Fixing broken hwt option

Author: tylerjpeterson

README.md

@@ -63,13 +63,13 @@ Diff to Html generates pretty HTML diffs from unified and git diff output in you
       --lm, --matching                  Diff line matching type   [choices: "lines", "words", "none"] [default: "none"]
       --lmt, --matchWordsThreshold      Diff line matching word threshold   [default: "0.25"]
       --lmm, --matchingMaxComparisons   Diff line matching maximum line comparisons of a block of changes [default: 2500]
+      --hwt, --htmlWrapperTemplate      Path to custom template to be rendered when using the "html" output format [string]
       -f, --format                      Output format   [choices: "html", "json"] [default: "html"]
       -d, --diff                        Diff style   [choices: "word", "char"] [default: "word"]
       -i, --input                       Diff input source   [choices: "file", "command", "stdin"] [default: "command"]
       -o, --output                      Output destination   [choices: "preview", "stdout"] [default: "preview"]
       -u, --diffy                       Upload to diffy.org   [choices: "browser", "pbcopy", "print"]
       -F, --file                        Send output to file (overrides output option)   [string]
-      -hwt, --html-wrapper-template     Path to custom template to be rendered when using the "html" output format [string]
       --version                         Show version number
       -h, --help                        Show help
 
@@ -85,7 +85,7 @@ Diff to Html generates pretty HTML diffs from unified and git diff output in you
           -> print json format to stdout
       diff2html -F my-pretty-diff.html -- -M HEAD~1
           ->  print to file
-      diff2html -F my-pretty-diff.html -hwt my-custom-template.html -- -M HEAD~1
+      diff2html -F my-pretty-diff.html --hwt my-custom-template.html -- -M HEAD~1
           ->  print to file using custom markup
               templates can include the following variables:
                 `<!--diff2html-css-->` - writes default CSS to page

src/cli.js

@@ -70,7 +70,7 @@
     var defaultTemplate = path.resolve(__dirname, '..', 'dist', 'template.html');
     config.wordByWord = (baseConfig.diff === 'word');
     config.charByChar = (baseConfig.diff === 'char');
-    config.template = baseConfig.template || defaultTemplate;
+    config.template = baseConfig.htmlWrapperTemplate || defaultTemplate;
 
     if (!fs.existsSync(config.template)) {
       return callback(new Error('Template (`' + baseConfig.template + '`) not found!'));

src/main.js

@@ -131,7 +131,7 @@ var argv = yargs.usage('Usage: diff2html [options] -- [diff args]')
   })
   .options({
     'hwt': {
-      alias: 'html-wrapper-template',
+      alias: 'htmlWrapperTemplate',
       describe: 'Use a custom template when generating markup',
       nargs: 1,
       type: 'string'