ꦫꦣꦺꦤ꧀ꦄꦤ꧀ꦠꦱꦺꦤ

PATH: usr / share / doc / git-1.8.3.1

git-diff(1)
===========

NAME
----
git-diff - Show changes between commits, commit and working tree, etc

SYNOPSIS
--------
[verse]
'git diff' [options] [<commit>] [--] [<path>...]
'git diff' [options] --cached [<commit>] [--] [<path>...]
'git diff' [options] <commit> <commit> [--] [<path>...]
'git diff' [options] <blob> <blob>
'git diff' [options] [--no-index] [--] <path> <path>

DESCRIPTION
-----------
Show changes between the working tree and the index or a tree, changes
between the index and a tree, changes between two trees, or changes
between two files on disk.

'git diff' [--options] [--] [<path>...]::

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 linkgit:git-add[1].
+
If exactly two paths are given and at least one points outside
the current repository, 'git diff' will compare the two files /
directories. This behavior can be forced by --no-index.

'git diff' [--options] --cached [<commit>] [--] [<path>...]::

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.
	If HEAD does not exist (e.g. unborned branches) and
	<commit> is not given, it shows all staged changes.
	--staged is a synonym of --cached.

'git diff' [--options] <commit> [--] [<path>...]::

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.

'git diff' [--options] <commit> <commit> [--] [<path>...]::

This is to view the changes between two arbitrary
	<commit>.

'git diff' [options] <blob> <blob>::

This form is to view the differences between the raw
	contents of two blob objects.

'git diff' [--options] <commit>..<commit> [--] [<path>...]::

This is synonymous to the previous form.  If <commit> on
	one side is omitted, it will have the same effect as
	using HEAD instead.

'git diff' [--options] <commit>\...<commit> [--] [<path>...]::

This form is to view the changes on the branch containing
	and up to the second <commit>, starting at a common ancestor
	of both <commit>.  "git diff A\...B" is equivalent to
	"git diff $(git-merge-base A B) B".  You can omit any one
	of <commit>, which has the same effect as using HEAD instead.

Just in case if you are doing something exotic, it should be
noted that all of the <commit> in the above description, except
in the last two forms that use ".." notations, can be any
<tree>.

For a more complete list of ways to spell <commit>, see
"SPECIFYING REVISIONS" section in linkgit:gitrevisions[7].
However, "diff" is about comparing two _endpoints_, not ranges,
and the range notations ("<commit>..<commit>" and
"<commit>\...<commit>") do not mean a range as defined in the
"SPECIFYING RANGES" section in linkgit:gitrevisions[7].

OPTIONS
-------
:git-diff: 1
include::diff-options.txt[]

<path>...::
	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).

include::diff-format.txt[]

EXAMPLES
--------

Various ways to check your working tree::
+
------------
$ git diff            <1>
$ git diff --cached   <2>
$ git diff HEAD       <3>
------------
+
<1> Changes in the working tree not yet staged for the next commit.
<2> Changes between the index and your last commit; what you
would be committing if you run "git commit" without "-a" option.
<3> Changes in the working tree since your last commit; what you
would be committing if you run "git commit -a"

Comparing with arbitrary commits::
+
------------
$ git diff test            <1>
$ git diff HEAD -- ./test  <2>
$ git diff HEAD^ HEAD      <3>
------------
+
<1> Instead of using the tip of the current branch, compare with the
tip of "test" branch.
<2> 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".
<3> Compare the version before the last commit and the last commit.

Comparing branches::
+
------------
$ git diff topic master    <1>
$ git diff topic..master   <2>
$ git diff topic...master  <3>
------------
+
<1> Changes between the tips of the topic and the master branches.
<2> Same as above.
<3> Changes that occurred on the master branch since when the topic
branch was started off it.

Limiting the diff output::
+
------------
$ git diff --diff-filter=MRC            <1>
$ git diff --name-status                <2>
$ git diff arch/i386 include/asm-i386   <3>
------------
+
<1> Show only modification, rename and copy, but not addition
nor deletion.
<2> Show only names and the nature of change, but not actual
diff output.
<3> Limit diff output to named subtrees.

Munging the diff output::
+
------------
$ git diff --find-copies-harder -B -C  <1>
$ git diff -R                          <2>
------------
+
<1> Spend extra cycles to find renames, copies and complete
rewrites (very expensive).
<2> Output diff in reverse.

SEE ALSO
--------
diff(1),
linkgit:git-difftool[1],
linkgit:git-log[1],
linkgit:gitdiffcore[7],
linkgit:git-format-patch[1],
linkgit:git-apply[1]

GIT
---
Part of the linkgit:git[1] suite

[+] ..
[-] gitworkflows.txt [edit]
[-] git-name-rev.txt [edit]
[-] git-status.html [edit]
[-] git-difftool.txt [edit]
[-] git-blame.html [edit]
[-] git-rebase.html [edit]
[-] git-push.html [edit]
[-] git-count-objects.txt [edit]
[-] mergetools-merge.txt [edit]
[-] git-show-index.txt [edit]
[-] gitcredentials.txt [edit]
[-] git-status.txt [edit]
[-] cmds-plumbinginterrogators.txt [edit]
[-] git.txt [edit]
[-] COPYING [edit]
[-] git-replace.txt [edit]
[-] git-cvsserver.txt [edit]
[-] git-apply.html [edit]
[-] gitweb.html [edit]
[-] git-rm.html [edit]
[-] git-cvsserver.html [edit]
[-] git-fetch.html [edit]
[-] git-daemon.html [edit]
[-] mailmap.txt [edit]
[-] git-for-each-ref.html [edit]
[-] gitk.txt [edit]
[-] diff-format.txt [edit]
[-] git-parse-remote.html [edit]
[-] gittutorial-2.html [edit]
[-] git-repack.txt [edit]
[-] gitcvs-migration.html [edit]
[-] gitrevisions.txt [edit]
[-] git-ls-files.html [edit]
[-] git-rev-parse.html [edit]
[-] git-show-ref.html [edit]
[-] blame-options.txt [edit]
[-] git-rev-list.txt [edit]
[-] git-index-pack.txt [edit]
[-] git-credential-cache.txt [edit]
[-] git-show-ref.txt [edit]
[-] pretty-formats.txt [edit]
[-] git-shortlog.txt [edit]
[-] pull-fetch-param.txt [edit]
[-] git-rev-list.html [edit]
[-] git-fmt-merge-msg.html [edit]
[-] git-clean.txt [edit]
[-] git-notes.txt [edit]
[-] git-count-objects.html [edit]
[-] git-clean.html [edit]
[-] git.html [edit]
[-] git-show-index.html [edit]
[-] git-fsck.html [edit]
[-] gitrepository-layout.html [edit]
[-] git-cvsimport.txt [edit]
[-] git-commit.html [edit]
[-] git-tag.html [edit]
[-] git-reflog.txt [edit]
[-] git-sh-i18n.txt [edit]
[-] git-stripspace.html [edit]
[-] gitweb.txt [edit]
[-] gitglossary.txt [edit]
[-] git-shell.txt [edit]
[-] git-prune.txt [edit]
[-] gitignore.html [edit]
[-] git-fast-export.html [edit]
[-] git-get-tar-commit-id.html [edit]
[-] git-http-fetch.html [edit]
[-] gitweb.conf.html [edit]
[-] git-notes.html [edit]
[-] git-update-index.html [edit]
[-] git-mailsplit.txt [edit]
[-] cmds-synchingrepositories.txt [edit]
[-] git-unpack-file.txt [edit]
[-] git-verify-tag.html [edit]
[-] gitdiffcore.html [edit]
[-] git-branch.txt [edit]
[-] git-request-pull.html [edit]
[-] git-diff-files.txt [edit]
[-] git-log.html [edit]
[-] git-check-ignore.html [edit]
[-] git-checkout-index.txt [edit]
[-] git-cherry.html [edit]
[-] git-diff-files.html [edit]
[-] git-receive-pack.txt [edit]
[-] git-mktree.html [edit]
[-] git-instaweb.html [edit]
[-] git-merge-file.html [edit]
[-] README [edit]
[-] git-stage.html [edit]
[+] howto
[-] git-tools.html [edit]
[-] fetch-options.txt [edit]
[-] git-remote.txt [edit]
[-] git-merge-base.txt [edit]
[-] git-pull.html [edit]
[-] git-merge-index.html [edit]
[-] githooks.txt [edit]
[-] git-svn.txt [edit]
[-] git-repo-config.html [edit]
[-] git-instaweb.txt [edit]
[+] contrib
[-] git-describe.html [edit]
[-] gitattributes.html [edit]
[-] gitcli.html [edit]
[-] git-fast-import.txt [edit]
[-] git-checkout.html [edit]
[-] merge-config.txt [edit]
[-] revisions.txt [edit]
[-] git-gc.txt [edit]
[-] git-credential-store.txt [edit]
[-] git-update-server-info.txt [edit]
[-] git-rm.txt [edit]
[-] cmds-ancillarymanipulators.txt [edit]
[-] git-mailsplit.html [edit]
[-] git-merge-one-file.txt [edit]
[-] git-help.html [edit]
[-] git-sh-i18n--envsubst.html [edit]
[-] git-reflog.html [edit]
[-] git-http-fetch.txt [edit]
[-] git-check-ref-format.html [edit]
[-] git-commit.txt [edit]
[-] git-p4.txt [edit]
[-] git-rev-parse.txt [edit]
[-] git-check-ref-format.txt [edit]
[-] git-merge-tree.html [edit]
[-] git-read-tree.txt [edit]
[-] git-check-attr.html [edit]
[-] git-mailinfo.txt [edit]
[-] git-mv.html [edit]
[-] git-quiltimport.txt [edit]
[-] git-daemon.txt [edit]
[-] git-ls-files.txt [edit]
[-] git-web--browse.txt [edit]
[-] git-patch-id.txt [edit]
[-] git-bisect-lk2009.html [edit]
[-] git-stripspace.txt [edit]
[-] gitmodules.html [edit]
[-] git-archive.html [edit]
[-] git-gc.html [edit]
[-] git-gui.txt [edit]
[-] pretty-options.txt [edit]
[-] git-column.txt [edit]
[-] git-fetch-pack.txt [edit]
[-] git-log.txt [edit]
[-] gitworkflows.html [edit]
[-] gitcore-tutorial.html [edit]
[-] git-prune.html [edit]
[-] git-cvsexportcommit.txt [edit]
[-] git-rerere.txt [edit]
[-] gitremote-helpers.html [edit]
[-] git-quiltimport.html [edit]
[-] git-fsck.txt [edit]
[-] git-peek-remote.txt [edit]
[-] git-imap-send.txt [edit]
[-] gitk.html [edit]
[-] git-hash-object.html [edit]
[-] git-push.txt [edit]
[-] git-blame.txt [edit]
[-] git-upload-archive.html [edit]
[-] git-replace.html [edit]
[+] technical
[-] git-upload-pack.html [edit]
[-] git-sh-i18n.html [edit]
[-] git-init.html [edit]
[-] git-bisect.txt [edit]
[-] git-http-push.html [edit]
[-] git-diff-index.html [edit]
[-] git-lost-found.html [edit]
[-] git-http-backend.html [edit]
[-] date-formats.txt [edit]
[-] git-mailinfo.html [edit]
[-] git-show-branch.html [edit]
[-] gitnamespaces.txt [edit]
[-] git-cherry.txt [edit]
[-] git-grep.html [edit]
[-] git-repo-config.txt [edit]
[-] git-ls-tree.html [edit]
[-] git-bisect.html [edit]
[-] git-send-email.txt [edit]
[-] git-credential-store.html [edit]
[-] git-rerere.html [edit]
[-] git-var.html [edit]
[-] git-remote.html [edit]
[-] git-tools.txt [edit]
[-] git-pack-objects.txt [edit]
[-] git-credential-cache--daemon.html [edit]
[-] git-update-index.txt [edit]
[-] git-gui.html [edit]
[-] git-svn.html [edit]
[-] gitweb.conf.txt [edit]
[-] gitignore.txt [edit]
[-] git-http-backend.txt [edit]
[-] howto-index.html [edit]
[-] git-stash.html [edit]
[-] git-mergetool.html [edit]
[-] git-relink.txt [edit]
[-] git-for-each-ref.txt [edit]
[-] cmds-foreignscminterface.txt [edit]
[-] git-shortlog.html [edit]
[-] cmds-ancillaryinterrogators.txt [edit]
[-] git-credential.txt [edit]
[-] git-mergetool--lib.html [edit]
[-] git-submodule.txt [edit]
[-] git-repack.html [edit]
[-] git-merge.html [edit]
[-] git-show.txt [edit]
[-] gitcvs-migration.txt [edit]
[-] diff-options.txt [edit]
[-] git-sh-setup.html [edit]
[-] git-config.html [edit]
[-] git-annotate.txt [edit]
[-] gitglossary.html [edit]
[-] git-pull.txt [edit]
[-] git-mergetool--lib.txt [edit]
[-] rev-list-options.txt [edit]
[-] git-fetch.txt [edit]
[-] gitcli.txt [edit]
[-] git-fsck-objects.html [edit]
[-] git-stash.txt [edit]
[-] git-pack-refs.html [edit]
[-] git-reset.txt [edit]
[-] cmds-mainporcelain.txt [edit]
[-] git-hash-object.txt [edit]
[-] gitmodules.txt [edit]
[-] git-cat-file.html [edit]
[-] git-bisect-lk2009.txt [edit]
[-] git-receive-pack.html [edit]
[-] git-p4.html [edit]
[-] mergetools-diff.txt [edit]
[-] git-cvsimport.html [edit]
[-] gitremote-helpers.txt [edit]
[-] git-column.html [edit]
[-] git-prune-packed.html [edit]
[-] glossary-content.txt [edit]
[+] RelNotes
[-] git-rebase.txt [edit]
[-] git-config.txt [edit]
[-] git-pack-refs.txt [edit]
[-] git-merge-index.txt [edit]
[-] git-add.html [edit]
[-] gitrevisions.html [edit]
[-] git-cherry-pick.txt [edit]
[-] git-symbolic-ref.txt [edit]
[-] git-annotate.html [edit]
[-] git-clone.txt [edit]
[-] git-parse-remote.txt [edit]
[-] git-diff.html [edit]
[-] git-diff-index.txt [edit]
[-] git-mergetool.txt [edit]
[-] git-update-ref.txt [edit]
[-] git-lost-found.txt [edit]
[-] git-tar-tree.txt [edit]
[-] git-update-server-info.html [edit]
[-] git-upload-pack.txt [edit]
[-] git-commit-tree.txt [edit]
[-] git-clone.html [edit]
[-] git-help.txt [edit]
[-] git-send-email.html [edit]
[-] everyday.html [edit]
[-] git-index-pack.html [edit]
[-] git-mktree.txt [edit]
[-] git-fast-import.html [edit]
[-] git-bundle.txt [edit]
[-] git-am.txt [edit]
[-] gittutorial-2.txt [edit]
[-] git-remote-testgit.html [edit]
[-] git-diff-tree.txt [edit]
[-] cmds-synchelpers.txt [edit]
[-] git-diff-tree.html [edit]
[-] git-prune-packed.txt [edit]
[-] cmds-plumbingmanipulators.txt [edit]
[-] howto-index.txt [edit]
[-] git-tag.txt [edit]
[-] git-send-pack.html [edit]
[-] git-credential-cache--daemon.txt [edit]
[-] config.txt [edit]
[-] git-remote-fd.html [edit]
[-] git-revert.txt [edit]
[-] gitdiffcore.txt [edit]
[-] git-fast-export.txt [edit]
[-] git-upload-archive.txt [edit]
[-] git-diff.txt [edit]
[-] git-merge-one-file.html [edit]
[-] git-archive.txt [edit]
[-] diff-generate-patch.txt [edit]
[-] git-http-push.txt [edit]
[-] git-init-db.html [edit]
[-] git-cat-file.txt [edit]
[-] git-fetch-pack.html [edit]
[-] git-whatchanged.html [edit]
[-] git-cvsexportcommit.html [edit]
[-] git-patch-id.html [edit]
[-] git-name-rev.html [edit]
[-] git-apply.txt [edit]
[-] gittutorial.txt [edit]
[-] git-shell.html [edit]
[-] git-verify-pack.html [edit]
[-] git-write-tree.html [edit]
[-] git-request-pull.txt [edit]
[-] git-remote-testgit.txt [edit]
[-] merge-strategies.txt [edit]
[-] git-write-tree.txt [edit]
[-] git-init-db.txt [edit]
[-] git-revert.html [edit]
[-] git-remote-ext.html [edit]
[-] urls.txt [edit]
[-] git-credential.html [edit]
[-] git-peek-remote.html [edit]
[-] git-stage.txt [edit]
[-] git-am.html [edit]
[-] git-verify-pack.txt [edit]
[-] git-filter-branch.txt [edit]
[-] git-unpack-objects.html [edit]
[-] git-format-patch.html [edit]
[-] diff-config.txt [edit]
[-] git-remote-helpers.html [edit]
[-] git-pack-redundant.txt [edit]
[-] git-verify-tag.txt [edit]
[-] git-describe.txt [edit]
[-] git-remote-fd.txt [edit]
[-] git-bundle.html [edit]
[-] git-show.html [edit]
[-] gitattributes.txt [edit]
[-] gittutorial.html [edit]
[-] git-ls-tree.txt [edit]
[-] git-get-tar-commit-id.txt [edit]
[-] git-branch.html [edit]
[-] merge-options.txt [edit]
[-] git-filter-branch.html [edit]
[-] i18n.txt [edit]
[-] git-check-ignore.txt [edit]
[-] git-tar-tree.html [edit]
[-] git-sh-i18n--envsubst.txt [edit]
[-] git-whatchanged.txt [edit]
[-] gitcore-tutorial.txt [edit]
[-] gitrepository-layout.txt [edit]
[-] git-mktag.txt [edit]
[-] git-fmt-merge-msg.txt [edit]
[-] git-ls-remote.html [edit]
[-] git-citool.html [edit]
[-] git-citool.txt [edit]
[-] user-manual.html [edit]
[-] git-pack-redundant.html [edit]
[-] git-mv.txt [edit]
[-] git-submodule.html [edit]
[-] git-grep.txt [edit]
[-] git-unpack-file.html [edit]
[-] git-mktag.html [edit]
[-] git-update-ref.html [edit]
[-] git-symbolic-ref.html [edit]
[-] githooks.html [edit]
[-] git-pack-objects.html [edit]
[-] git-cherry-pick.html [edit]
[-] everyday.txt [edit]
[-] git-unpack-objects.txt [edit]
[-] git-read-tree.html [edit]
[-] git-show-branch.txt [edit]
[-] git-merge-tree.txt [edit]
[-] git-merge.txt [edit]
[-] git-ls-remote.txt [edit]
[-] git-merge-base.html [edit]
[-] git-imap-send.html [edit]
[-] gitcredentials.html [edit]
[-] git-commit-tree.html [edit]
[-] git-format-patch.txt [edit]
[-] git-web--browse.html [edit]
[-] git-sh-setup.txt [edit]
[-] git-var.txt [edit]
[-] gitnamespaces.html [edit]
[-] git-add.txt [edit]
[-] git-checkout-index.html [edit]
[-] docbook-xsl.css [edit]
[-] git-merge-file.txt [edit]
[-] git-reset.html [edit]
[-] git-fsck-objects.txt [edit]
[-] git-check-attr.txt [edit]
[-] git-difftool.html [edit]
[-] urls-remotes.txt [edit]
[-] git-send-pack.txt [edit]
[-] git-remote-ext.txt [edit]
[-] git-checkout.txt [edit]
[-] git-relink.html [edit]
[-] user-manual.txt [edit]
[-] sequencer.txt [edit]
[-] git-credential-cache.html [edit]
[-] cmds-purehelpers.txt [edit]
[-] git-init.txt [edit]