Skip to content

Multiline diff blocks #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rtfpessoa merged 3 commits into from
Apr 19, 2015
Merged

Multiline diff blocks #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ab4d2e
depend on the library project
rtfpessoa Apr 11, 2015
19f7441
new version
rtfpessoa Apr 12, 2015
e1d7088
add support for both wordByWord and charByChar hightlight
rtfpessoa Apr 12, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Diff to Html Node Module by [rtfpessoa](https://github.com/rtfpessoa)
# Diff to Html Node Module (CLI) by [rtfpessoa](https://github.com/rtfpessoa)

Diff to Html generates pretty HTML diffs.

### Inspiration

This project uses [diff2html](https://github.com/rtfpessoa/diff2html) as base.
This project is just a CLI for [diff2html-nodejs](https://github.com/rtfpessoa/diff2html-nodejs).

## Features

Expand All @@ -26,9 +26,11 @@ This project uses [diff2html](https://github.com/rtfpessoa/diff2html) as base.

* Manually download and import [diff2html.js](https://github.com/rtfpessoa/diff2html) into your page

* Import Node library [diff2html-nodejs](https://github.com/rtfpessoa/diff2html-nodejs) into your package.json

## Setup

sudo npm install -g diff2html
sudo npm install -g diff2html-cli

## Usage

Expand Down
19 changes: 10 additions & 9 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "diff2html",
"version": "0.1.9",
"name": "diff2html-cli",
"version": "0.2.0-3",

"homepage": "https://www.github.com/rtfpessoa/diff2html-nodejs",
"homepage": "https://www.github.com/rtfpessoa/diff2html-nodejs-cli",
"description": "Fast Diff to colorized HTML",
"keywords": [
"git",
Expand All @@ -29,15 +29,15 @@

"repository": {
"type": "git",
"url": "https://www.github.com/rtfpessoa/diff2html-nodejs.git"
"url": "https://www.github.com/rtfpessoa/diff2html-nodejs-cli.git"
},

"bugs": {
"url": "https://www.github.com/rtfpessoa/diff2html-nodejs/issues"
"url": "https://www.github.com/rtfpessoa/diff2html-nodejs-cli/issues"
},

"engines": {
"node": ">=0.10"
"node": ">=0.12.2"
},

"preferGlobal": "true",
Expand All @@ -50,12 +50,13 @@
"diff2html": "./bin/diff2html"
},

"main": "./src/diff2html.js",
"main": "./src/main.js",

"dependencies": {
"commander": "2.7.1",
"extend": "2.0.0",
"pkginfo": "0.3.0"
"pkginfo": "0.3.0",
"diff2html": "0.2.0-7"
},

"devDependencies": {
Expand All @@ -64,7 +65,7 @@
"licenses": [
{
"type": "MIT",
"url": "https://github.com/rtfpessoa/diff2html-node/blob/master/LICENSE"
"url": "https://github.com/rtfpessoa/diff2html-node-cli/blob/master/LICENSE"
}
],

Expand Down
Loading