Skip to content

Commit 85f833d

Browse files
committed
Update to diff2html 2.0.0-beta10 fixing big diffs
1 parent f2f3faa commit 85f833d

File tree

3 files changed

+24
-14
lines changed

3 files changed

+24
-14
lines changed

Diff for: README.md

+13-12
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,19 @@ Diff to Html generates pretty HTML diffs from git diff output in your terminal
5454
Usage: diff2html [options] -- [diff args]
5555

5656
Options:
57-
-s, --style Output style [string] [choices: "line", "side"] [default: "line"]
58-
--su, --summary Show files summary [string] [choices: "closed", "open", "hidden"] [default: "closed"]
59-
--lm, --matching Diff line matching type [string] [choices: "lines", "words", "none"] [default: "none"]
60-
--lmt, --matchWordsThreshold Diff line matching word threshold [string] [default: "0.25"]
61-
-f, --format Output format [string] [choices: "html", "json"] [default: "html"]
62-
-d, --diff Diff style [string] [choices: "word", "char"] [default: "word"]
63-
-i, --input Diff input source [string] [choices: "file", "command", "stdin"] [default: "command"]
64-
-o, --output Output destination [string] [choices: "preview", "stdout"] [default: "preview"]
65-
-u, --diffy Upload to diffy.org [string] [choices: "browser", "pbcopy", "print"]
66-
-F, --file Send output to file (overrides output option) [string]
67-
--version Show version number [boolean]
68-
-h, --help Show help [boolean]
57+
-s, --style Output style [string] [choices: "line", "side"] [default: "line"]
58+
--su, --summary Show files summary [string] [choices: "closed", "open", "hidden"] [default: "closed"]
59+
--lm, --matching Diff line matching type [string] [choices: "lines", "words", "none"] [default: "none"]
60+
--lmt, --matchWordsThreshold Diff line matching word threshold [string] [default: "0.25"]
61+
--lmm, --matchingMaxComparisons Diff line matching maximum line comparisons of a block of changes [default: 2500]
62+
-f, --format Output format [string] [choices: "html", "json"] [default: "html"]
63+
-d, --diff Diff style [string] [choices: "word", "char"] [default: "word"]
64+
-i, --input Diff input source [string] [choices: "file", "command", "stdin"] [default: "command"]
65+
-o, --output Output destination [string] [choices: "preview", "stdout"] [default: "preview"]
66+
-u, --diffy Upload to diffy.org [string] [choices: "browser", "pbcopy", "print"]
67+
-F, --file Send output to file (overrides output option) [string]
68+
--version Show version number [boolean]
69+
-h, --help Show help [boolean]
6970

7071
Examples:
7172
diff2html -s line -f html -d word -i command -o preview -- -M HEAD~1

Diff for: package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "diff2html-cli",
3-
"version": "1.4.6-beta3",
3+
"version": "1.4.6-beta4",
44
"homepage": "https://www.github.com/rtfpessoa/diff2html-cli",
55
"description": "Fast Diff to colorized HTML",
66
"keywords": [
@@ -46,7 +46,7 @@
4646
"main": "./src/main.js",
4747
"dependencies": {
4848
"copy-paste": "^1.1.4",
49-
"diff2html": "^2.0.0-beta9",
49+
"diff2html": "^2.0.0-beta10",
5050
"extend": "^3.0.0",
5151
"open": "0.0.5",
5252
"request": "^2.69.0",

Diff for: src/main.js

+9
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,15 @@ var argv = yargs.usage('Usage: diff2html [options] -- [diff args]')
5252
default: '0.25'
5353
}
5454
})
55+
.options({
56+
'lmm': {
57+
alias: 'matchingMaxComparisons',
58+
describe: 'Diff line matching maximum line comparisons of a block of changes',
59+
nargs: 1,
60+
type: 'string',
61+
default: '2500'
62+
}
63+
})
5564
.options({
5665
'f': {
5766
alias: 'format',

0 commit comments

Comments
 (0)