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.2" />
 <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;commit&gt;{0,2} [--] [&lt;path&gt;&#8230;]</p>
 </div>
 <h2>DESCRIPTION</h2>
 <div class="sectionbody">
 <p>Show changes between two trees, a tree and the working tree, a
 tree and the index file, or the index file and the working tree.</p>
 <dl>
 <dt>
 <em>git-diff</em> [--options] [--] [&lt;path&gt;&#8230;]
 </dt>
 <dd>
 <p>
  This form is to view the changes you made relative to
  the index (staging area for the next commit). In other
  words, the differences are what you _could_ tell git to
  further add to the index but you still haven't. You can
  stage these changes by using <a href="git-add.html">git-add(1)</a>.
 </p>
 </dd>
 <dt>
 <em>git-diff</em> [--options] --cached [&lt;commit&gt;] [--] [&lt;path&gt;&#8230;]
 </dt>
 <dd>
 <p>
  This form is to view the changes you staged for the next
  commit relative to the named &lt;commit&gt;. Typically you
  would want comparison with the latest commit, so if you
  do not give &lt;commit&gt;, it defaults to HEAD.
 </p>
 </dd>
 <dt>
 <em>git-diff</em> [--options] &lt;commit&gt; [--] [&lt;path&gt;&#8230;]
 </dt>
 <dd>
 <p>
  This form is to view the changes you have in your
  working tree relative to the named &lt;commit&gt;. You can
  use HEAD to compare it with the latest commit, or a
  branch name to compare with the tip of a different
  branch.
 </p>
 </dd>
 <dt>
 <em>git-diff</em> [--options] &lt;commit&gt; &lt;commit&gt; [--] [&lt;path&gt;&#8230;]
 </dt>
 <dd>
 <p>
  This form is to view the changes between two &lt;commit&gt;,
  for example, tips of two branches.
 </p>
 </dd>
 </dl>
 <p>Just in case if you are doing something exotic, it should be
 noted that all of the &lt;commit&gt; in the above description can be
 any &lt;tree-ish&gt;.</p>
 </div>
 <h2>OPTIONS</h2>
 <div class="sectionbody">
 <dl>
 <dt>
 -p
 </dt>
 <dd>
 <p>
  Generate patch (see section on generating patches)
 </p>
 </dd>
 <dt>
 -u
 </dt>
 <dd>
 <p>
  Synonym for "-p".
 </p>
 </dd>
 <dt>
 --raw
 </dt>
 <dd>
 <p>
  Generate the raw format.
 </p>
 </dd>
 <dt>
 --patch-with-raw
 </dt>
 <dd>
 <p>
  Synonym for "-p --raw".
 </p>
 </dd>
 <dt>
 --stat[=width[,name-width]]
 </dt>
 <dd>
 <p>
  Generate a diffstat. You can override the default
  output width for 80-column terminal by "--stat=width".
  The width of the filename part can be controlled by
  giving another width to it separated by a comma.
 </p>
 </dd>
 <dt>
 --numstat
 </dt>
 <dd>
 <p>
  Similar to --stat, but shows number of added and
  deleted lines in decimal notation and pathname without
  abbreviation, to make it more machine friendly. For
  binary files, outputs two <tt>-</tt> instead of saying
  <tt>0 0</tt>.
 </p>
 </dd>
 <dt>
 --shortstat
 </dt>
 <dd>
 <p>
  Output only the last line of the --stat format containing total
  number of modified files, as well as number of added and deleted
  lines.
 </p>
 </dd>
 <dt>
 --summary
 </dt>
 <dd>
 <p>
  Output a condensed summary of extended header information
  such as creations, renames and mode changes.
 </p>
 </dd>
 <dt>
 --patch-with-stat
 </dt>
 <dd>
 <p>
  Synonym for "-p --stat".
 </p>
 </dd>
 <dt>
 -z
 </dt>
 <dd>
 <p>
  \0 line termination on output
 </p>
 </dd>
 <dt>
 --name-only
 </dt>
 <dd>
 <p>
  Show only names of changed files.
 </p>
 </dd>
 <dt>
 --name-status
 </dt>
 <dd>
 <p>
  Show only names and status of changed files.
 </p>
 </dd>
 <dt>
 --color
 </dt>
 <dd>
 <p>
  Show colored diff.
 </p>
 </dd>
 <dt>
 --no-color
 </dt>
 <dd>
 <p>
  Turn off colored diff, even when the configuration file
  gives the default to color output.
 </p>
 </dd>
 <dt>
 --color-words
 </dt>
 <dd>
 <p>
  Show colored word diff, i.e. color words which have changed.
 </p>
 </dd>
 <dt>
 --no-renames
 </dt>
 <dd>
 <p>
  Turn off rename detection, even when the configuration
  file gives the default to do so.
 </p>
 </dd>
 <dt>
 --full-index
 </dt>
 <dd>
 <p>
  Instead of the first handful characters, show full
  object name of pre- and post-image blob on the "index"
  line when generating a patch format output.
 </p>
 </dd>
 <dt>
 --binary
 </dt>
 <dd>
 <p>
  In addition to --full-index, output "binary diff" that
  can be applied with "git apply".
 </p>
 </dd>
 <dt>
 --abbrev[=&lt;n&gt;]
 </dt>
 <dd>
 <p>
  Instead of showing the full 40-byte hexadecimal object
  name in diff-raw format output and diff-tree header
  lines, show only handful hexdigits prefix. This is
  independent of --full-index option above, which controls
  the diff-patch output format. Non default number of
  digits can be specified with --abbrev=&lt;n&gt;.
 </p>
 </dd>
 <dt>
 -B
 </dt>
 <dd>
 <p>
  Break complete rewrite changes into pairs of delete and create.
 </p>
 </dd>
 <dt>
 -M
 </dt>
 <dd>
 <p>
  Detect renames.
 </p>
 </dd>
 <dt>
 -C
 </dt>
 <dd>
 <p>
  Detect copies as well as renames.
 </p>
 </dd>
 <dt>
 --diff-filter=[ACDMRTUXB*]
 </dt>
 <dd>
 <p>
  Select only files that are Added (<tt>A</tt>), Copied (<tt>C</tt>),
  Deleted (<tt>D</tt>), Modified (<tt>M</tt>), Renamed (<tt>R</tt>), have their
  type (mode) changed (<tt>T</tt>), are Unmerged (<tt>U</tt>), are
  Unknown (<tt>X</tt>), or have had their pairing Broken (<tt>B</tt>).
  Any combination of the filter characters may be used.
  When <tt>*</tt> (All-or-none) is added to the combination, all
  paths are selected if there is any file that matches
  other criteria in the comparison; if there is no file
  that matches other criteria, nothing is selected.
 </p>
 </dd>
 <dt>
 --find-copies-harder
 </dt>
 <dd>
 <p>
  For performance reasons, by default, -C option finds copies only
  if the original file of the copy was modified in the same
  changeset. This flag makes the command
  inspect unmodified files as candidates for the source of
  copy. This is a very expensive operation for large
  projects, so use it with caution.
 </p>
 </dd>
 <dt>
 -l&lt;num&gt;
 </dt>
 <dd>
 <p>
  -M and -C options require O(n^2) processing time where n
  is the number of potential rename/copy targets. This
  option prevents rename/copy detection from running if
  the number of rename/copy targets exceeds the specified
  number.
 </p>
 </dd>
 <dt>
 -S&lt;string&gt;
 </dt>
 <dd>
 <p>
  Look for differences that contain the change in &lt;string&gt;.
 </p>
 </dd>
 <dt>
 --pickaxe-all
 </dt>
 <dd>
 <p>
  When -S finds a change, show all the changes in that
  changeset, not just the files that contain the change
  in &lt;string&gt;.
 </p>
 </dd>
 <dt>
 --pickaxe-regex
 </dt>
 <dd>
 <p>
  Make the &lt;string&gt; not a plain string but an extended POSIX
  regex to match.
 </p>
 </dd>
 <dt>
 -O&lt;orderfile&gt;
 </dt>
 <dd>
 <p>
  Output the patch in the order specified in the
  &lt;orderfile&gt;, which has one shell glob pattern per line.
 </p>
 </dd>
 <dt>
 -R
 </dt>
 <dd>
 <p>
  Swap two inputs; that is, show differences from index or
  on-disk file to tree contents.
 </p>
 </dd>
 <dt>
 --text
 </dt>
 <dd>
 <p>
  Treat all files as text.
 </p>
 </dd>
 <dt>
 -a
 </dt>
 <dd>
 <p>
  Shorthand for "--text".
 </p>
 </dd>
 <dt>
 --ignore-space-change
 </dt>
 <dd>
 <p>
  Ignore changes in amount of white space. This ignores white
  space at line end, and consider all other sequences of one or
  more white space characters to be equivalent.
 </p>
 </dd>
 <dt>
 -b
 </dt>
 <dd>
 <p>
  Shorthand for "--ignore-space-change".
 </p>
 </dd>
 <dt>
 --ignore-all-space
 </dt>
 <dd>
 <p>
  Ignore white space when comparing lines. This ignores
  difference even if one line has white space where the other
  line has none.
 </p>
 </dd>
 <dt>
 -w
 </dt>
 <dd>
 <p>
  Shorthand for "--ignore-all-space".
 </p>
 </dd>
 </dl>
 <p>For more detailed explanation on these common options, see also
 <a href="diffcore.html">diffcore documentation</a>.</p>
 <dl>
 <dt>
 &lt;path&gt;&#8230;
 </dt>
 <dd>
 <p>
  The &lt;paths&gt; parameters, when given, are used to limit
  the diff to the named paths (you can give directory
  names and get diff for all files under them).
 </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></tt></pre>
 </div></div>
 <ol>
 <li>
 <p>
 changes in the working tree not yet staged for the next commit.
 </p>
 </li>
 <li>
 <p>
 changes between the index and your last commit; what you
 would be committing if you run "git commit" without "-a" option.
 </p>
 </li>
 <li>
 <p>
 changes in the working tree since your last commit; what you
 would be committing if you run "git commit -a"
 </p>
 </li>
 </ol>
 </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></tt></pre>
 </div></div>
 <ol>
 <li>
 <p>
 instead of using the tip of the current branch, compare with the
 tip of "test" branch.
 </p>
 </li>
 <li>
 <p>
 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".
 </p>
 </li>
 <li>
 <p>
 compare the version before the last commit and the last commit.
 </p>
 </li>
 </ol>
 </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></tt></pre>
 </div></div>
 <ol>
 <li>
 <p>
 show only modification, rename and copy, but not addition
 nor deletion.
 </p>
 </li>
 <li>
 <p>
 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 behavior, so without -r
 you would only see the directory name if there is a change in a
 file in a subdirectory.
 </p>
 </li>
 <li>
 <p>
 limit diff output to named subtrees.
 </p>
 </li>
 </ol>
 </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></tt></pre>
 </div></div>
 <ol>
 <li>
 <p>
 spend extra cycles to find renames, copies and complete
 rewrites (very expensive).
 </p>
 </li>
 <li>
 <p>
 output diff in reverse.
 </p>
 </li>
 </ol>
 </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 26-Dec-2006 09:11:34 UTC
 </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.2" />
	<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 ] <commit>{0,2} [--] [<path>…]</p>
	</div>
	<h2>DESCRIPTION</h2>
	<div class="sectionbody">
	<p>Show changes between two trees, a tree and the working tree, a
	tree and the index file, or the index file and the working tree.</p>
	<dl>
	<dt>
	<em>git-diff</em> [--options] [--] [<path>…]
	</dt>
	<dd>
	<p>
	This form is to view the changes you made relative to
	the index (staging area for the next commit). In other
	words, the differences are what you _could_ tell git to
	further add to the index but you still haven't. You can
	stage these changes by using <a href="git-add.html">git-add(1)</a>.
	</p>
	</dd>
	<dt>
	<em>git-diff</em> [--options] --cached [<commit>] [--] [<path>…]
	</dt>
	<dd>
	<p>
	This form is to view the changes you staged for the next
	commit relative to the named <commit>. Typically you
	would want comparison with the latest commit, so if you
	do not give <commit>, it defaults to HEAD.
	</p>
	</dd>
	<dt>
	<em>git-diff</em> [--options] <commit> [--] [<path>…]
	</dt>
	<dd>
	<p>
	This form is to view the changes you have in your
	working tree relative to the named <commit>. You can
	use HEAD to compare it with the latest commit, or a
	branch name to compare with the tip of a different
	branch.
	</p>
	</dd>
	<dt>
	<em>git-diff</em> [--options] <commit> <commit> [--] [<path>…]
	</dt>
	<dd>
	<p>
	This form is to view the changes between two <commit>,
	for example, tips of two branches.
	</p>
	</dd>
	</dl>
	<p>Just in case if you are doing something exotic, it should be
	noted that all of the <commit> in the above description can be
	any <tree-ish>.</p>
	</div>
	<h2>OPTIONS</h2>
	<div class="sectionbody">
	<dl>
	<dt>
	-p
	</dt>
	<dd>
	<p>
	Generate patch (see section on generating patches)
	</p>
	</dd>
	<dt>
	-u
	</dt>
	<dd>
	<p>
	Synonym for "-p".
	</p>
	</dd>
	<dt>
	--raw
	</dt>
	<dd>
	<p>
	Generate the raw format.
	</p>
	</dd>
	<dt>
	--patch-with-raw
	</dt>
	<dd>
	<p>
	Synonym for "-p --raw".
	</p>
	</dd>
	<dt>
	--stat[=width[,name-width]]
	</dt>
	<dd>
	<p>
	Generate a diffstat. You can override the default
	output width for 80-column terminal by "--stat=width".
	The width of the filename part can be controlled by
	giving another width to it separated by a comma.
	</p>
	</dd>
	<dt>
	--numstat
	</dt>
	<dd>
	<p>
	Similar to --stat, but shows number of added and
	deleted lines in decimal notation and pathname without
	abbreviation, to make it more machine friendly. For
	binary files, outputs two <tt>-</tt> instead of saying
	<tt>0 0</tt>.
	</p>
	</dd>
	<dt>
	--shortstat
	</dt>
	<dd>
	<p>
	Output only the last line of the --stat format containing total
	number of modified files, as well as number of added and deleted
	lines.
	</p>
	</dd>
	<dt>
	--summary
	</dt>
	<dd>
	<p>
	Output a condensed summary of extended header information
	such as creations, renames and mode changes.
	</p>
	</dd>
	<dt>
	--patch-with-stat
	</dt>
	<dd>
	<p>
	Synonym for "-p --stat".
	</p>
	</dd>
	<dt>
	-z
	</dt>
	<dd>
	<p>
	\0 line termination on output
	</p>
	</dd>
	<dt>
	--name-only
	</dt>
	<dd>
	<p>
	Show only names of changed files.
	</p>
	</dd>
	<dt>
	--name-status
	</dt>
	<dd>
	<p>
	Show only names and status of changed files.
	</p>
	</dd>
	<dt>
	--color
	</dt>
	<dd>
	<p>
	Show colored diff.
	</p>
	</dd>
	<dt>
	--no-color
	</dt>
	<dd>
	<p>
	Turn off colored diff, even when the configuration file
	gives the default to color output.
	</p>
	</dd>
	<dt>
	--color-words
	</dt>
	<dd>
	<p>
	Show colored word diff, i.e. color words which have changed.
	</p>
	</dd>
	<dt>
	--no-renames
	</dt>
	<dd>
	<p>
	Turn off rename detection, even when the configuration
	file gives the default to do so.
	</p>
	</dd>
	<dt>
	--full-index
	</dt>
	<dd>
	<p>
	Instead of the first handful characters, show full
	object name of pre- and post-image blob on the "index"
	line when generating a patch format output.
	</p>
	</dd>
	<dt>
	--binary
	</dt>
	<dd>
	<p>
	In addition to --full-index, output "binary diff" that
	can be applied with "git apply".
	</p>
	</dd>
	<dt>
	--abbrev[=<n>]
	</dt>
	<dd>
	<p>
	Instead of showing the full 40-byte hexadecimal object
	name in diff-raw format output and diff-tree header
	lines, show only handful hexdigits prefix. This is
	independent of --full-index option above, which controls
	the diff-patch output format. Non default number of
	digits can be specified with --abbrev=<n>.
	</p>
	</dd>
	<dt>
	-B
	</dt>
	<dd>
	<p>
	Break complete rewrite changes into pairs of delete and create.
	</p>
	</dd>
	<dt>
	-M
	</dt>
	<dd>
	<p>
	Detect renames.
	</p>
	</dd>
	<dt>
	-C
	</dt>
	<dd>
	<p>
	Detect copies as well as renames.
	</p>
	</dd>
	<dt>
	--diff-filter=[ACDMRTUXB*]
	</dt>
	<dd>
	<p>
	Select only files that are Added (<tt>A</tt>), Copied (<tt>C</tt>),
	Deleted (<tt>D</tt>), Modified (<tt>M</tt>), Renamed (<tt>R</tt>), have their
	type (mode) changed (<tt>T</tt>), are Unmerged (<tt>U</tt>), are
	Unknown (<tt>X</tt>), or have had their pairing Broken (<tt>B</tt>).
	Any combination of the filter characters may be used.
	When <tt>*</tt> (All-or-none) is added to the combination, all
	paths are selected if there is any file that matches
	other criteria in the comparison; if there is no file
	that matches other criteria, nothing is selected.
	</p>
	</dd>
	<dt>
	--find-copies-harder
	</dt>
	<dd>
	<p>
	For performance reasons, by default, -C option finds copies only
	if the original file of the copy was modified in the same
	changeset. This flag makes the command
	inspect unmodified files as candidates for the source of
	copy. This is a very expensive operation for large
	projects, so use it with caution.
	</p>
	</dd>
	<dt>
	-l<num>
	</dt>
	<dd>
	<p>
	-M and -C options require O(n^2) processing time where n
	is the number of potential rename/copy targets. This
	option prevents rename/copy detection from running if
	the number of rename/copy targets exceeds the specified
	number.
	</p>
	</dd>
	<dt>
	-S<string>
	</dt>
	<dd>
	<p>
	Look for differences that contain the change in <string>.
	</p>
	</dd>
	<dt>
	--pickaxe-all
	</dt>
	<dd>
	<p>
	When -S finds a change, show all the changes in that
	changeset, not just the files that contain the change
	in <string>.
	</p>
	</dd>
	<dt>
	--pickaxe-regex
	</dt>
	<dd>
	<p>
	Make the <string> not a plain string but an extended POSIX
	regex to match.
	</p>
	</dd>
	<dt>
	-O<orderfile>
	</dt>
	<dd>
	<p>
	Output the patch in the order specified in the
	<orderfile>, which has one shell glob pattern per line.
	</p>
	</dd>
	<dt>
	-R
	</dt>
	<dd>
	<p>
	Swap two inputs; that is, show differences from index or
	on-disk file to tree contents.
	</p>
	</dd>
	<dt>
	--text
	</dt>
	<dd>
	<p>
	Treat all files as text.
	</p>
	</dd>
	<dt>
	-a
	</dt>
	<dd>
	<p>
	Shorthand for "--text".
	</p>
	</dd>
	<dt>
	--ignore-space-change
	</dt>
	<dd>
	<p>
	Ignore changes in amount of white space. This ignores white
	space at line end, and consider all other sequences of one or
	more white space characters to be equivalent.
	</p>
	</dd>
	<dt>
	-b
	</dt>
	<dd>
	<p>
	Shorthand for "--ignore-space-change".
	</p>
	</dd>
	<dt>
	--ignore-all-space
	</dt>
	<dd>
	<p>
	Ignore white space when comparing lines. This ignores
	difference even if one line has white space where the other
	line has none.
	</p>
	</dd>
	<dt>
	-w
	</dt>
	<dd>
	<p>
	Shorthand for "--ignore-all-space".
	</p>
	</dd>
	</dl>
	<p>For more detailed explanation on these common options, see also
	<a href="diffcore.html">diffcore documentation</a>.</p>
	<dl>
	<dt>
	<path>…
	</dt>
	<dd>
	<p>
	The <paths> parameters, when given, are used to limit
	the diff to the named paths (you can give directory
	names and get diff for all files under them).
	</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></tt></pre>
	</div></div>
	<ol>
	<li>
	<p>
	changes in the working tree not yet staged for the next commit.
	</p>
	</li>
	<li>
	<p>
	changes between the index and your last commit; what you
	would be committing if you run "git commit" without "-a" option.
	</p>
	</li>
	<li>
	<p>
	changes in the working tree since your last commit; what you
	would be committing if you run "git commit -a"
	</p>
	</li>
	</ol>
	</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></tt></pre>
	</div></div>
	<ol>
	<li>
	<p>
	instead of using the tip of the current branch, compare with the
	tip of "test" branch.
	</p>
	</li>
	<li>
	<p>
	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".
	</p>
	</li>
	<li>
	<p>
	compare the version before the last commit and the last commit.
	</p>
	</li>
	</ol>
	</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></tt></pre>
	</div></div>
	<ol>
	<li>
	<p>
	show only modification, rename and copy, but not addition
	nor deletion.
	</p>
	</li>
	<li>
	<p>
	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 behavior, so without -r
	you would only see the directory name if there is a change in a
	file in a subdirectory.
	</p>
	</li>
	<li>
	<p>
	limit diff output to named subtrees.
	</p>
	</li>
	</ol>
	</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></tt></pre>
	</div></div>
	<ol>
	<li>
	<p>
	spend extra cycles to find renames, copies and complete
	rewrites (very expensive).
	</p>
	</li>
	<li>
	<p>
	output diff in reverse.
	</p>
	</li>
	</ol>
	</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 26-Dec-2006 09:11:34 UTC
	</div>
	</div>
	</body>
	</html>