Update to diff2html 2.0.0-beta10 fixing big diffs

rtfpessoa · Apr 14, 2016 · 85f833d · 85f833d
1 parent f2f3faa
commit 85f833d
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -54,18 +54,19 @@ Diff to Html generates pretty HTML diffs from git diff output in your terminal
     Usage: diff2html [options] -- [diff args]
 
     Options:
-      -s, --style                   Output style   [string] [choices: "line", "side"] [default: "line"]
-      --su, --summary               Show files summary   [string] [choices: "closed", "open", "hidden"] [default: "closed"]
-      --lm, --matching              Diff line matching type   [string] [choices: "lines", "words", "none"] [default: "none"]
-      --lmt, --matchWordsThreshold  Diff line matching word threshold   [string] [default: "0.25"]
-      -f, --format                  Output format   [string] [choices: "html", "json"] [default: "html"]
-      -d, --diff                    Diff style   [string] [choices: "word", "char"] [default: "word"]
-      -i, --input                   Diff input source   [string] [choices: "file", "command", "stdin"] [default: "command"]
-      -o, --output                  Output destination   [string] [choices: "preview", "stdout"] [default: "preview"]
-      -u, --diffy                   Upload to diffy.org   [string] [choices: "browser", "pbcopy", "print"]
-      -F, --file                    Send output to file (overrides output option)   [string]
-      --version                     Show version number                    [boolean]
-      -h, --help                    Show help                              [boolean]
+      -s, --style                       Output style   [string] [choices: "line", "side"] [default: "line"]
+      --su, --summary                   Show files summary   [string] [choices: "closed", "open", "hidden"] [default: "closed"]
+      --lm, --matching                  Diff line matching type   [string] [choices: "lines", "words", "none"] [default: "none"]
+      --lmt, --matchWordsThreshold      Diff line matching word threshold   [string] [default: "0.25"]
+      --lmm, --matchingMaxComparisons   Diff line matching maximum line comparisons of a block of changes [default: 2500]
+      -f, --format                      Output format   [string] [choices: "html", "json"] [default: "html"]
+      -d, --diff                        Diff style   [string] [choices: "word", "char"] [default: "word"]
+      -i, --input                       Diff input source   [string] [choices: "file", "command", "stdin"] [default: "command"]
+      -o, --output                      Output destination   [string] [choices: "preview", "stdout"] [default: "preview"]
+      -u, --diffy                       Upload to diffy.org   [string] [choices: "browser", "pbcopy", "print"]
+      -F, --file                        Send output to file (overrides output option)   [string]
+      --version                         Show version number                    [boolean]
+      -h, --help                        Show help                              [boolean]
 
     Examples:
       diff2html -s line -f html -d word -i command -o preview -- -M HEAD~1

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "diff2html-cli",
-  "version": "1.4.6-beta3",
+  "version": "1.4.6-beta4",
   "homepage": "https://www.github.com/rtfpessoa/diff2html-cli",
   "description": "Fast Diff to colorized HTML",
   "keywords": [
@@ -46,7 +46,7 @@
   "main": "./src/main.js",
   "dependencies": {
     "copy-paste": "^1.1.4",
-    "diff2html": "^2.0.0-beta9",
+    "diff2html": "^2.0.0-beta10",
     "extend": "^3.0.0",
     "open": "0.0.5",
     "request": "^2.69.0",

diff --git a/src/main.js b/src/main.js
@@ -52,6 +52,15 @@ var argv = yargs.usage('Usage: diff2html [options] -- [diff args]')
       default: '0.25'
     }
   })
+  .options({
+    'lmm': {
+      alias: 'matchingMaxComparisons',
+      describe: 'Diff line matching maximum line comparisons of a block of changes',
+      nargs: 1,
+      type: 'string',
+      default: '2500'
+    }
+  })
   .options({
     'f': {
       alias: 'format',