2016-10-09 22:01:01 +00:00
|
|
|
<!DOCTYPE html>
|
|
|
|
|
<html lang="en" class="js">
|
|
|
|
|
<head>
|
|
|
|
|
<meta charset="utf-8">
|
|
|
|
|
<!--[if IE]>
|
|
|
|
|
<meta http-equiv='X-UA-Compatible' content='IE=edge,chrome=1'/>
|
|
|
|
|
<![endif]-->
|
|
|
|
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
|
|
|
|
|
|
|
|
|
<meta name="description" content="Diff parser and pretty html generator">
|
|
|
|
|
<meta name="keywords" content="diff2html,git,diff,unified,pretty,html,css,javaccript">
|
|
|
|
|
<meta name="author" content="Rodrigo Fernandes (rtfpessoa)">
|
|
|
|
|
|
|
|
|
|
<title>diff2html</title>
|
|
|
|
|
|
|
|
|
|
<!-- search engine -->
|
|
|
|
|
<link rel="canonical" href="https://diff2html.xyz">
|
|
|
|
|
|
|
|
|
|
<!-- open graph -->
|
|
|
|
|
<meta property="og:title" content="diff2html">
|
|
|
|
|
<meta property="og:type" content="website">
|
|
|
|
|
|
|
|
|
|
<meta property="og:description"
|
|
|
|
|
content="Diff parser and pretty html generator.">
|
|
|
|
|
|
|
|
|
|
<meta property="og:url" content="https://diff2html.xyz">
|
|
|
|
|
<meta property="og:site_name" content="diff2html">
|
|
|
|
|
|
|
|
|
|
<!-- Bootstrap -->
|
|
|
|
|
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css"
|
|
|
|
|
integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">
|
|
|
|
|
|
|
|
|
|
<!-- Custom styles for this template -->
|
|
|
|
|
<link href="main.css" rel="stylesheet">
|
|
|
|
|
|
|
|
|
|
<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.6.0/styles/github.min.css">
|
|
|
|
|
|
|
|
|
|
<!-- diff2html -->
|
|
|
|
|
<link rel="stylesheet" type="text/css" href="assets/diff2html.css">
|
|
|
|
|
<!-- -->
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<script>
|
|
|
|
|
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
|
|
|
|
|
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
|
|
|
|
|
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
|
|
|
|
|
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
|
|
|
|
|
|
|
|
|
|
ga('create', 'UA-78351861-2', 'auto');
|
|
|
|
|
ga('send', 'pageview');
|
|
|
|
|
|
|
|
|
|
</script>
|
|
|
|
|
</head>
|
|
|
|
|
<body class="swag-line template-index">
|
|
|
|
|
<div class="container-overflow-wrap">
|
|
|
|
|
|
|
|
|
|
<div class="container">
|
|
|
|
|
<nav class="navbar navbar-default navbar-tall navbar-full" role="navigation">
|
|
|
|
|
<div class="navbar-header">
|
|
|
|
|
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#global-nav">
|
|
|
|
|
<span class="sr-only">Toggle navigation</span>
|
|
|
|
|
<span class="icon-bar"></span>
|
|
|
|
|
<span class="icon-bar"></span>
|
|
|
|
|
<span class="icon-bar"></span>
|
|
|
|
|
</button>
|
|
|
|
|
<a class="navbar-brand" href="index.html">diff2html</a>
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
<div class="collapse navbar-collapse" id="global-nav">
|
|
|
|
|
<div class="navbar-right">
|
|
|
|
|
<ul class="nav navbar-nav">
|
|
|
|
|
|
|
|
|
|
<li>
|
|
|
|
|
<a href="index.html#install">Getting Started</a>
|
|
|
|
|
</li>
|
|
|
|
|
|
|
|
|
|
<li>
|
|
|
|
|
<a href="index.html#cli">CLI</a>
|
|
|
|
|
</li>
|
|
|
|
|
|
|
|
|
|
<li>
|
2016-10-12 21:52:59 +00:00
|
|
|
<a href="url.html?diff=https://github.com/rtfpessoa/diff2html/pull/106">Demo</a>
|
2016-10-09 22:01:01 +00:00
|
|
|
</li>
|
|
|
|
|
|
|
|
|
|
<li>
|
|
|
|
|
<a href="https://github.com/rtfpessoa/diff2html#how-to-use" target="_blank">Docs</a>
|
|
|
|
|
</li>
|
|
|
|
|
|
|
|
|
|
<li>
|
|
|
|
|
<a href="https://github.com/rtfpessoa/diff2html/issues/new" target="_blank">Support</a>
|
|
|
|
|
</li>
|
|
|
|
|
</ul>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
</nav>
|
|
|
|
|
|
|
|
|
|
<h1>Diff Prettifier <a href="#help">?</a></h1>
|
|
|
|
|
<p>GitHub, Bitbucket and GitLab commit and pull request compatible</p>
|
|
|
|
|
<p>Just paste the GitHub, Bitbucket or GitLab commit, pull request or merge request url
|
|
|
|
|
or any other git or unified compatible diff and we will render a pretty html representation of it
|
|
|
|
|
with code syntax highlight and line similarity matching for better code reviews.
|
|
|
|
|
</p>
|
2016-10-12 21:52:59 +00:00
|
|
|
<h3>Options:</h3>
|
|
|
|
|
<div class="diff-url-options-container">
|
|
|
|
|
<h5>Output:</h5>
|
|
|
|
|
<label>Format
|
|
|
|
|
<select id="diff-url-options-output-format" name="outputFormat">
|
|
|
|
|
<option value="line-by-line" selected>Line by Line</option>
|
|
|
|
|
<option value="side-by-side">Side by Side</option>
|
|
|
|
|
</select>
|
|
|
|
|
</label>
|
|
|
|
|
<label>Show Files
|
|
|
|
|
<input id="diff-url-options-show-files" type="checkbox" name="showFiles" checked/>
|
|
|
|
|
</label>
|
|
|
|
|
<h5>Matching:</h5>
|
|
|
|
|
<label>Type
|
|
|
|
|
<select id="diff-url-options-matching" name="matching">
|
|
|
|
|
<option value="lines">Lines</option>
|
|
|
|
|
<option value="words" selected>Words</option>
|
|
|
|
|
<option value="none">None</option>
|
|
|
|
|
</select>
|
|
|
|
|
</label>
|
|
|
|
|
<label>Words Threshold
|
|
|
|
|
<input id="diff-url-options-match-words-threshold" type="number" name="matchWordsThreshold" value="0.25" step="0.05"
|
|
|
|
|
min="0" max="1"/>
|
|
|
|
|
</label>
|
|
|
|
|
<label>Maximum Comparisons
|
|
|
|
|
<input id="diff-url-options-matching-max-comparisons" type="number" name="matchingMaxComparisons" value="2500"
|
|
|
|
|
step="100" min="0"/>
|
|
|
|
|
</label>
|
|
|
|
|
</div>
|
2016-10-09 22:01:01 +00:00
|
|
|
<br>
|
|
|
|
|
<div class="diff-url-wrapper">
|
|
|
|
|
<a id="url-btn" class="diff-url-btn btn btn-sm" href="#">Load</a>
|
|
|
|
|
<input id="url" class="diff-url-input" type="text" name="url" placeholder="URL"/>
|
|
|
|
|
</div>
|
|
|
|
|
<br>
|
2016-10-12 21:52:59 +00:00
|
|
|
<div id="url-diff-container" style="margin: 0 auto;">
|
2016-10-09 22:01:01 +00:00
|
|
|
</div>
|
|
|
|
|
<br>
|
|
|
|
|
<h3 id="help">Help:</h3>
|
|
|
|
|
<ul>
|
|
|
|
|
<li>
|
|
|
|
|
<b>Why should I use this instead of GitHub, Bitbucket or GitLab?</b>
|
|
|
|
|
<p>Code Syntax Highlight</p>
|
|
|
|
|
<p>Line similarity match (similar lines are together)</p>
|
|
|
|
|
<p>Line by Line and Side by Side (SOON) diffs</p>
|
|
|
|
|
<p>Supports any git and unified compatible diffs</p>
|
|
|
|
|
<p>Easy code selection</p>
|
|
|
|
|
</li>
|
|
|
|
|
<li>
|
|
|
|
|
<b>What urls are supported?</b>
|
|
|
|
|
<p>Any GitHub, Bitbucket or GitLab Commit, Pull Request or Merge Request urls.</p>
|
|
|
|
|
<p>Any Git or Unified Raw Diff or Patch urls.</p>
|
|
|
|
|
</li>
|
|
|
|
|
<li>
|
|
|
|
|
<b>Can I send a custom url for a friend, colleague or co-worker?</b>
|
2016-10-12 21:52:59 +00:00
|
|
|
<p>Just add a url parameter called diff to current url using as value your Commit, Pull Request, Merge Request, Diff
|
|
|
|
|
or Patch url.</p>
|
|
|
|
|
<p>ex: <a href="url.html?diff=https://github.com/rtfpessoa/diff2html/pull/106">https://diff2html.xyz/url?diff=https://github.com/rtfpessoa/diff2html/pull/106</a>
|
|
|
|
|
</p>
|
2016-10-09 22:01:01 +00:00
|
|
|
<p>You can also use an hashtag (# or #! or #!/) in the end of the url.
|
|
|
|
|
This will be overridden if you click any href id and for that reason not advised.</p>
|
|
|
|
|
</li>
|
|
|
|
|
<li>
|
|
|
|
|
<b>Why can't I paste a diff?</b>
|
2016-10-12 21:52:59 +00:00
|
|
|
<p><a href="https://diffy.org/">diffy.org</a> is an amazing tool created by <a
|
|
|
|
|
href="https://github.com/pbu88">pbu88</a>
|
2016-10-09 22:01:01 +00:00
|
|
|
to share your diffs and uses diff2html under the hood.</p>
|
|
|
|
|
<p>Also, diff2html cli can directly publish diffs to <a href="https://diffy.org/">diffy.org</a></p>
|
|
|
|
|
</li>
|
|
|
|
|
</ul>
|
|
|
|
|
<br>
|
|
|
|
|
<h3>Thank you</h3>
|
|
|
|
|
<p>I want to thank <a href="https://github.com/kevinsimper">kevinsimper</a> for this great idea,
|
|
|
|
|
providing better diff support for existing online services.
|
|
|
|
|
</p>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
<footer class="footer clearfix">
|
|
|
|
|
<p class="col-xs-10 col-xs-offset-1">
|
|
|
|
|
Website originally designed and built by
|
|
|
|
|
<a href="https://twitter.com/mdo" target="_blank">@mdo</a>,
|
|
|
|
|
<a href="https://twitter.com/fat" target="_blank">@fat</a>, and
|
|
|
|
|
<a href="https://twitter.com/dhg" target="_blank">@dhg</a>,
|
|
|
|
|
adapted with <span class="hero-red">❤</span> by
|
|
|
|
|
<a href="https://twitter.com/rtfpessoa" target="_blank">@rtfpessoa</a>.
|
|
|
|
|
</p>
|
|
|
|
|
<ul class="footer-list col-xs-10 col-xs-offset-1">
|
|
|
|
|
|
|
|
|
|
<li class="footer-list-item">
|
|
|
|
|
<a class="footer-list-link" href="https://github.com/rtfpessoa/diff2html#how-to-use"
|
|
|
|
|
target="_blank">FAQ</a>
|
|
|
|
|
</li>
|
|
|
|
|
|
|
|
|
|
<li class="footer-list-item">
|
|
|
|
|
<a class="footer-list-link" href="https://diff2html.xyz">diff2html</a>
|
|
|
|
|
</li>
|
|
|
|
|
|
|
|
|
|
</ul>
|
|
|
|
|
</footer>
|
|
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
<!-- General JavaScript -->
|
|
|
|
|
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.3/jquery.min.js"></script>
|
|
|
|
|
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"
|
|
|
|
|
integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS"
|
|
|
|
|
crossorigin="anonymous"></script>
|
|
|
|
|
|
|
|
|
|
<script type="application/ld+json">
|
|
|
|
|
{
|
|
|
|
|
"@context": "http://schema.org/",
|
|
|
|
|
"@type": "SoftwareSourceCode",
|
|
|
|
|
"name": "diff2html",
|
|
|
|
|
"author": "Rodrigo Fernandes",
|
|
|
|
|
"image": "https://diff2html.xyz/img/snapshot-3.png",
|
|
|
|
|
"description": "Diff parser and pretty html generator.",
|
|
|
|
|
"codeRepository": "https://github.com/rtfpessoa/diff2html",
|
|
|
|
|
"programmingLanguage": "JavaScript",
|
|
|
|
|
"runtimePlatform": "Node >= 0.12",
|
|
|
|
|
"mainEntityOfPage": "https://diff2html.xyz/"
|
|
|
|
|
}
|
|
|
|
|
</script>
|
|
|
|
|
|
|
|
|
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.6.0/highlight.min.js"></script>
|
|
|
|
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.6.0/languages/scala.min.js"></script>
|
|
|
|
|
|
|
|
|
|
<!-- diff2html -->
|
|
|
|
|
<script type="text/javascript" src="assets/diff2html.js"></script>
|
|
|
|
|
<script type="text/javascript" src="assets/diff2html-ui.js"></script>
|
|
|
|
|
<!-- -->
|
|
|
|
|
|
2016-10-12 21:52:59 +00:00
|
|
|
<script type="text/javascript" src="url.js"></script>
|
2016-10-09 22:01:01 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
</body>
|
|
|
|
|
</html>
|
