git-diff.html - external/gitster/git-htmldocs - Git at Google

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
  "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <meta name="generator" content="AsciiDoc 7.0.1" />
 <style type="text/css">
 /* Debug borders */
 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
 /*
  border: 1px solid red;
 */
 }

 body {
  margin: 1em 5% 1em 5%;
 }

 a { color: blue; }
 a:visited { color: fuchsia; }

 em {
  font-style: italic;
 }

 strong {
  font-weight: bold;
 }

 tt {
  color: navy;
 }

 h1, h2, h3, h4, h5, h6 {
  color: #527bbd;
  font-family: sans-serif;
  margin-top: 1.2em;
  margin-bottom: 0.5em;
  line-height: 1.3;
 }

 h1 {
  border-bottom: 2px solid silver;
 }
 h2 {
  border-bottom: 2px solid silver;
  padding-top: 0.5em;
 }

 div.sectionbody {
  font-family: serif;
  margin-left: 0;
 }

 hr {
  border: 1px solid silver;
 }

 p {
  margin-top: 0.5em;
  margin-bottom: 0.5em;
 }

 pre {
  padding: 0;
  margin: 0;
 }

 span#author {
  color: #527bbd;
  font-family: sans-serif;
  font-weight: bold;
  font-size: 1.2em;
 }
 span#email {
 }
 span#revision {
  font-family: sans-serif;
 }

 div#footer {
  font-family: sans-serif;
  font-size: small;
  border-top: 2px solid silver;
  padding-top: 0.5em;
  margin-top: 4.0em;
 }
 div#footer-text {
  float: left;
  padding-bottom: 0.5em;
 }
 div#footer-badges {
  float: right;
  padding-bottom: 0.5em;
 }

 div#preamble,
 div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
 div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
 div.admonitionblock {
  margin-right: 10%;
  margin-top: 1.5em;
  margin-bottom: 1.5em;
 }
 div.admonitionblock {
  margin-top: 2.5em;
  margin-bottom: 2.5em;
 }

 div.content { /* Block element content. */
  padding: 0;
 }

 /* Block element titles. */
 div.title, caption.title {
  font-family: sans-serif;
  font-weight: bold;
  text-align: left;
  margin-top: 1.0em;
  margin-bottom: 0.5em;
 }
 div.title + * {
  margin-top: 0;
 }

 td div.title:first-child {
  margin-top: 0.0em;
 }
 div.content div.title:first-child {
  margin-top: 0.0em;
 }
 div.content + div.title {
  margin-top: 0.0em;
 }

 div.sidebarblock > div.content {
  background: #ffffee;
  border: 1px solid silver;
  padding: 0.5em;
 }

 div.listingblock > div.content {
  border: 1px solid silver;
  background: #f4f4f4;
  padding: 0.5em;
 }

 div.quoteblock > div.content {
  padding-left: 2.0em;
 }
 div.quoteblock .attribution {
  text-align: right;
 }

 div.admonitionblock .icon {
  vertical-align: top;
  font-size: 1.1em;
  font-weight: bold;
  text-decoration: underline;
  color: #527bbd;
  padding-right: 0.5em;
 }
 div.admonitionblock td.content {
  padding-left: 0.5em;
  border-left: 2px solid silver;
 }

 div.exampleblock > div.content {
  border-left: 2px solid silver;
  padding: 0.5em;
 }

 div.verseblock div.content {
  white-space: pre;
 }

 div.imageblock div.content { padding-left: 0; }
 div.imageblock img { border: 1px solid silver; }
 span.image img { border-style: none; }

 dl {
  margin-top: 0.8em;
  margin-bottom: 0.8em;
 }
 dt {
  margin-top: 0.5em;
  margin-bottom: 0;
  font-style: italic;
 }
 dd > *:first-child {
  margin-top: 0;
 }

 ul, ol {
  list-style-position: outside;
 }
 ol.olist2 {
  list-style-type: lower-alpha;
 }

 div.tableblock > table {
  border-color: #527bbd;
  border-width: 3px;
 }
 thead {
  font-family: sans-serif;
  font-weight: bold;
 }
 tfoot {
  font-weight: bold;
 }

 div.hlist {
  margin-top: 0.8em;
  margin-bottom: 0.8em;
 }
 td.hlist1 {
  vertical-align: top;
  font-style: italic;
  padding-right: 0.8em;
 }
 td.hlist2 {
  vertical-align: top;
 }

 @media print {
  div#footer-badges { display: none; }
 }
 include::./stylesheets/xhtml11-manpage.css[]
 /* Workarounds for IE6's broken and incomplete CSS2. */

 div.sidebar-content {
  background: #ffffee;
  border: 1px solid silver;
  padding: 0.5em;
 }
 div.sidebar-title, div.image-title {
  font-family: sans-serif;
  font-weight: bold;
  margin-top: 0.0em;
  margin-bottom: 0.5em;
 }

 div.listingblock div.content {
  border: 1px solid silver;
  background: #f4f4f4;
  padding: 0.5em;
 }

 div.quoteblock-content {
  padding-left: 2.0em;
 }

 div.exampleblock-content {
  border-left: 2px solid silver;
  padding-left: 0.5em;
 }
 </style>
 <title>git-diff(1)</title>
 </head>
 <body>
 <div id="header">
 <h1>
 git-diff(1) Manual Page
 </h1>
 <h2>NAME</h2>
 <div class="sectionbody">
 <p>git-diff -
  Show changes between commits, commit and working tree, etc.
 </p>
 </div>
 </div>
 <h2>SYNOPSIS</h2>
 <div class="sectionbody">
 <p><em>git-diff</em> [ --diff-options ] &lt;ent&gt;{0,2} [&lt;path&gt;&#8230;]</p>
 </div>
 <h2>DESCRIPTION</h2>
 <div class="sectionbody">
 <p>Show changes between two ents, an ent and the working tree, an
 ent and the index file, or the index file and the working tree.
 The combination of what is compared with what is determined by
 the number of ents given to the command.</p>
 <ul>
 <li>
 <p>
 When no &lt;ent&gt; is given, the working tree and the index
  file is compared, using <tt>git-diff-files</tt>.
 </p>
 </li>
 <li>
 <p>
 When one &lt;ent&gt; is given, the working tree and the named
  tree is compared, using <tt>git-diff-index</tt>. The option
  <tt>--cached</tt> can be given to compare the index file and
  the named tree.
 </p>
 </li>
 <li>
 <p>
 When two &lt;ent&gt;s are given, these two trees are compared
  using <tt>git-diff-tree</tt>.
 </p>
 </li>
 </ul>
 </div>
 <h2>OPTIONS</h2>
 <div class="sectionbody">
 <dl>
 <dt>
 --diff-options
 </dt>
 <dd>
 <p>
  <em>--diff-options</em> are passed to the <tt>git-diff-files</tt>,
  <tt>git-diff-index</tt>, and <tt>git-diff-tree</tt> commands. See the
  documentation for these commands for description.
 </p>
 </dd>
 <dt>
 &lt;path&gt;&#8230;
 </dt>
 <dd>
 <p>
  The &lt;path&gt; arguments are also passed to <tt>git-diff-*</tt>
  commands.
 </p>
 </dd>
 </dl>
 </div>
 <h2>EXAMPLES</h2>
 <div class="sectionbody">
 <dl>
 <dt>
 Various ways to check your working tree
 </dt>
 <dd>
 <div class="listingblock">
 <div class="content">
 <pre><tt>$ git diff <b>(1)</b>
 $ git diff --cached <b>(2)</b>
 $ git diff HEAD <b>(3)</b>

 <b>(1)</b> changes in the working tree since your last git-update-index.
 <b>(2)</b> changes between the index and your last commit; what you
 would be committing if you run "git commit" without "-a" option.
 <b>(3)</b> changes in the working tree since your last commit; what you
 would be committing if you run "git commit -a"</tt></pre>
 </div></div>
 </dd>
 <dt>
 Comparing with arbitrary commits
 </dt>
 <dd>
 <div class="listingblock">
 <div class="content">
 <pre><tt>$ git diff test <b>(1)</b>
 $ git diff HEAD -- ./test <b>(2)</b>
 $ git diff HEAD^ HEAD <b>(3)</b>

 <b>(1)</b> instead of using the tip of the current branch, compare with the
 tip of "test" branch.
 <b>(2)</b> instead of comparing with the tip of "test" branch, compare with
 the tip of the current branch, but limit the comparison to the
 file "test".
 <b>(3)</b> compare the version before the last commit and the last commit.</tt></pre>
 </div></div>
 </dd>
 <dt>
 Limiting the diff output
 </dt>
 <dd>
 <div class="listingblock">
 <div class="content">
 <pre><tt>$ git diff --diff-filter=MRC <b>(1)</b>
 $ git diff --name-status -r <b>(2)</b>
 $ git diff arch/i386 include/asm-i386 <b>(3)</b>

 <b>(1)</b> show only modification, rename and copy, but not addition
 nor deletion.
 <b>(2)</b> show only names and the nature of change, but not actual
 diff output. --name-status disables usual patch generation
 which in turn also disables recursive behaviour, so without -r
 you would only see the directory name if there is a change in a
 file in a subdirectory.
 <b>(3)</b> limit diff output to named subtrees.</tt></pre>
 </div></div>
 </dd>
 <dt>
 Munging the diff output
 </dt>
 <dd>
 <div class="listingblock">
 <div class="content">
 <pre><tt>$ git diff --find-copies-harder -B -C <b>(1)</b>
 $ git diff -R <b>(2)</b>

 <b>(1)</b> spend extra cycles to find renames, copies and complete
 rewrites (very expensive).
 <b>(2)</b> output diff in reverse.</tt></pre>
 </div></div>
 </dd>
 </dl>
 </div>
 <h2>Author</h2>
 <div class="sectionbody">
 <p>Written by Linus Torvalds &lt;torvalds@osdl.org&gt;</p>
 </div>
 <h2>Documentation</h2>
 <div class="sectionbody">
 <p>Documentation by Junio C Hamano and the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
 <p>Part of the <a href="git.html">git(7)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
 Last updated 06-Jan-2006 17:12:28 PDT
 </div>
 </div>
 </body>
 </html>
	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
	"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
	<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
	<head>
	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
	<meta name="generator" content="AsciiDoc 7.0.1" />
	<style type="text/css">
	/* Debug borders */
	p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
	/*
	border: 1px solid red;
	*/
	}

	body {
	margin: 1em 5% 1em 5%;
	}

	a { color: blue; }
	a:visited { color: fuchsia; }

	em {
	font-style: italic;
	}

	strong {
	font-weight: bold;
	}

	tt {
	color: navy;
	}

	h1, h2, h3, h4, h5, h6 {
	color: #527bbd;
	font-family: sans-serif;
	margin-top: 1.2em;
	margin-bottom: 0.5em;
	line-height: 1.3;
	}

	h1 {
	border-bottom: 2px solid silver;
	}
	h2 {
	border-bottom: 2px solid silver;
	padding-top: 0.5em;
	}

	div.sectionbody {
	font-family: serif;
	margin-left: 0;
	}

	hr {
	border: 1px solid silver;
	}

	p {
	margin-top: 0.5em;
	margin-bottom: 0.5em;
	}

	pre {
	padding: 0;
	margin: 0;
	}

	span#author {
	color: #527bbd;
	font-family: sans-serif;
	font-weight: bold;
	font-size: 1.2em;
	}
	span#email {
	}
	span#revision {
	font-family: sans-serif;
	}

	div#footer {
	font-family: sans-serif;
	font-size: small;
	border-top: 2px solid silver;
	padding-top: 0.5em;
	margin-top: 4.0em;
	}
	div#footer-text {
	float: left;
	padding-bottom: 0.5em;
	}
	div#footer-badges {
	float: right;
	padding-bottom: 0.5em;
	}

	div#preamble,
	div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
	div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
	div.admonitionblock {
	margin-right: 10%;
	margin-top: 1.5em;
	margin-bottom: 1.5em;
	}
	div.admonitionblock {
	margin-top: 2.5em;
	margin-bottom: 2.5em;
	}

	div.content { /* Block element content. */
	padding: 0;
	}

	/* Block element titles. */
	div.title, caption.title {
	font-family: sans-serif;
	font-weight: bold;
	text-align: left;
	margin-top: 1.0em;
	margin-bottom: 0.5em;
	}
	div.title + * {
	margin-top: 0;
	}

	td div.title:first-child {
	margin-top: 0.0em;
	}
	div.content div.title:first-child {
	margin-top: 0.0em;
	}
	div.content + div.title {
	margin-top: 0.0em;
	}

	div.sidebarblock > div.content {
	background: #ffffee;
	border: 1px solid silver;
	padding: 0.5em;
	}

	div.listingblock > div.content {
	border: 1px solid silver;
	background: #f4f4f4;
	padding: 0.5em;
	}

	div.quoteblock > div.content {
	padding-left: 2.0em;
	}
	div.quoteblock .attribution {
	text-align: right;
	}

	div.admonitionblock .icon {
	vertical-align: top;
	font-size: 1.1em;
	font-weight: bold;
	text-decoration: underline;
	color: #527bbd;
	padding-right: 0.5em;
	}
	div.admonitionblock td.content {
	padding-left: 0.5em;
	border-left: 2px solid silver;
	}

	div.exampleblock > div.content {
	border-left: 2px solid silver;
	padding: 0.5em;
	}

	div.verseblock div.content {
	white-space: pre;
	}

	div.imageblock div.content { padding-left: 0; }
	div.imageblock img { border: 1px solid silver; }
	span.image img { border-style: none; }

	dl {
	margin-top: 0.8em;
	margin-bottom: 0.8em;
	}
	dt {
	margin-top: 0.5em;
	margin-bottom: 0;
	font-style: italic;
	}
	dd > *:first-child {
	margin-top: 0;
	}

	ul, ol {
	list-style-position: outside;
	}
	ol.olist2 {
	list-style-type: lower-alpha;
	}

	div.tableblock > table {
	border-color: #527bbd;
	border-width: 3px;
	}
	thead {
	font-family: sans-serif;
	font-weight: bold;
	}
	tfoot {
	font-weight: bold;
	}

	div.hlist {
	margin-top: 0.8em;
	margin-bottom: 0.8em;
	}
	td.hlist1 {
	vertical-align: top;
	font-style: italic;
	padding-right: 0.8em;
	}
	td.hlist2 {
	vertical-align: top;
	}

	@media print {
	div#footer-badges { display: none; }
	}
	include::./stylesheets/xhtml11-manpage.css[]
	/* Workarounds for IE6's broken and incomplete CSS2. */

	div.sidebar-content {
	background: #ffffee;
	border: 1px solid silver;
	padding: 0.5em;
	}
	div.sidebar-title, div.image-title {
	font-family: sans-serif;
	font-weight: bold;
	margin-top: 0.0em;
	margin-bottom: 0.5em;
	}

	div.listingblock div.content {
	border: 1px solid silver;
	background: #f4f4f4;
	padding: 0.5em;
	}

	div.quoteblock-content {
	padding-left: 2.0em;
	}

	div.exampleblock-content {
	border-left: 2px solid silver;
	padding-left: 0.5em;
	}
	</style>
	<title>git-diff(1)</title>
	</head>
	<body>
	<div id="header">
	<h1>
	git-diff(1) Manual Page
	</h1>
	<h2>NAME</h2>
	<div class="sectionbody">
	<p>git-diff -
	Show changes between commits, commit and working tree, etc.
	</p>
	</div>
	</div>
	<h2>SYNOPSIS</h2>
	<div class="sectionbody">
	<p><em>git-diff</em> [ --diff-options ] <ent>{0,2} [<path>…]</p>
	</div>
	<h2>DESCRIPTION</h2>
	<div class="sectionbody">
	<p>Show changes between two ents, an ent and the working tree, an
	ent and the index file, or the index file and the working tree.
	The combination of what is compared with what is determined by
	the number of ents given to the command.</p>
	<ul>
	<li>
	<p>
	When no <ent> is given, the working tree and the index
	file is compared, using <tt>git-diff-files</tt>.
	</p>
	</li>
	<li>
	<p>
	When one <ent> is given, the working tree and the named
	tree is compared, using <tt>git-diff-index</tt>. The option
	<tt>--cached</tt> can be given to compare the index file and
	the named tree.
	</p>
	</li>
	<li>
	<p>
	When two <ent>s are given, these two trees are compared
	using <tt>git-diff-tree</tt>.
	</p>
	</li>
	</ul>
	</div>
	<h2>OPTIONS</h2>
	<div class="sectionbody">
	<dl>
	<dt>
	--diff-options
	</dt>
	<dd>
	<p>
	<em>--diff-options</em> are passed to the <tt>git-diff-files</tt>,
	<tt>git-diff-index</tt>, and <tt>git-diff-tree</tt> commands. See the
	documentation for these commands for description.
	</p>
	</dd>
	<dt>
	<path>…
	</dt>
	<dd>
	<p>
	The <path> arguments are also passed to <tt>git-diff-*</tt>
	commands.
	</p>
	</dd>
	</dl>
	</div>
	<h2>EXAMPLES</h2>
	<div class="sectionbody">
	<dl>
	<dt>
	Various ways to check your working tree
	</dt>
	<dd>
	<div class="listingblock">
	<div class="content">
	<pre><tt>$ git diff <b>(1)</b>
	$ git diff --cached <b>(2)</b>
	$ git diff HEAD <b>(3)</b>

	<b>(1)</b> changes in the working tree since your last git-update-index.
	<b>(2)</b> changes between the index and your last commit; what you
	would be committing if you run "git commit" without "-a" option.
	<b>(3)</b> changes in the working tree since your last commit; what you
	would be committing if you run "git commit -a"</tt></pre>
	</div></div>
	</dd>
	<dt>
	Comparing with arbitrary commits
	</dt>
	<dd>
	<div class="listingblock">
	<div class="content">
	<pre><tt>$ git diff test <b>(1)</b>
	$ git diff HEAD -- ./test <b>(2)</b>
	$ git diff HEAD^ HEAD <b>(3)</b>

	<b>(1)</b> instead of using the tip of the current branch, compare with the
	tip of "test" branch.
	<b>(2)</b> instead of comparing with the tip of "test" branch, compare with
	the tip of the current branch, but limit the comparison to the
	file "test".
	<b>(3)</b> compare the version before the last commit and the last commit.</tt></pre>
	</div></div>
	</dd>
	<dt>
	Limiting the diff output
	</dt>
	<dd>
	<div class="listingblock">
	<div class="content">
	<pre><tt>$ git diff --diff-filter=MRC <b>(1)</b>
	$ git diff --name-status -r <b>(2)</b>
	$ git diff arch/i386 include/asm-i386 <b>(3)</b>

	<b>(1)</b> show only modification, rename and copy, but not addition
	nor deletion.
	<b>(2)</b> show only names and the nature of change, but not actual
	diff output. --name-status disables usual patch generation
	which in turn also disables recursive behaviour, so without -r
	you would only see the directory name if there is a change in a
	file in a subdirectory.
	<b>(3)</b> limit diff output to named subtrees.</tt></pre>
	</div></div>
	</dd>
	<dt>
	Munging the diff output
	</dt>
	<dd>
	<div class="listingblock">
	<div class="content">
	<pre><tt>$ git diff --find-copies-harder -B -C <b>(1)</b>
	$ git diff -R <b>(2)</b>

	<b>(1)</b> spend extra cycles to find renames, copies and complete
	rewrites (very expensive).
	<b>(2)</b> output diff in reverse.</tt></pre>
	</div></div>
	</dd>
	</dl>
	</div>
	<h2>Author</h2>
	<div class="sectionbody">
	<p>Written by Linus Torvalds <torvalds@osdl.org></p>
	</div>
	<h2>Documentation</h2>
	<div class="sectionbody">
	<p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p>
	</div>
	<h2>GIT</h2>
	<div class="sectionbody">
	<p>Part of the <a href="git.html">git(7)</a> suite</p>
	</div>
	<div id="footer">
	<div id="footer-text">
	Last updated 06-Jan-2006 17:12:28 PDT
	</div>
	</div>
	</body>
	</html>