Documentation/git-diff.txt

   1 git-diff(1)
   2 ===========
   3
   4 NAME
   5 ----
   6 git-diff - Show changes between commits, commit and working tree, etc
   7
   8
   9 SYNOPSIS
  10 --------
  11 [verse]
  12 'git diff' [<options>] [<commit>] [--] [<path>...]
  13 'git diff' [<options>] --cached [<commit>] [--] [<path>...]
  14 'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...]
  15 'git diff' [<options>] <commit>...<commit> [--] [<path>...]
  16 'git diff' [<options>] <blob> <blob>
  17 'git diff' [<options>] --no-index [--] <path> <path>
  18
  19 DESCRIPTION
  20 -----------
  21 Show changes between the working tree and the index or a tree, changes
  22 between the index and a tree, changes between two trees, changes resulting
  23 from a merge, changes between two blob objects, or changes between two
  24 files on disk.
  25
  26 'git diff' [<options>] [--] [<path>...]::
  27
  28         This form is to view the changes you made relative to
  29         the index (staging area for the next commit).  In other
  30         words, the differences are what you _could_ tell Git to
  31         further add to the index but you still haven't.  You can
  32         stage these changes by using linkgit:git-add[1].
  33
  34 'git diff' [<options>] --no-index [--] <path> <path>::
  35
  36         This form is to compare the given two paths on the
  37         filesystem.  You can omit the `--no-index` option when
  38         running the command in a working tree controlled by Git and
  39         at least one of the paths points outside the working tree,
  40         or when running the command outside a working tree
  41         controlled by Git. This form implies `--exit-code`.
  42
  43 'git diff' [<options>] --cached [<commit>] [--] [<path>...]::
  44
  45         This form is to view the changes you staged for the next
  46         commit relative to the named <commit>.  Typically you
  47         would want comparison with the latest commit, so if you
  48         do not give <commit>, it defaults to HEAD.
  49         If HEAD does not exist (e.g. unborn branches) and
  50         <commit> is not given, it shows all staged changes.
  51         --staged is a synonym of --cached.
  52
  53 'git diff' [<options>] <commit> [--] [<path>...]::
  54
  55         This form is to view the changes you have in your
  56         working tree relative to the named <commit>.  You can
  57         use HEAD to compare it with the latest commit, or a
  58         branch name to compare with the tip of a different
  59         branch.
  60
  61 'git diff' [<options>] <commit> <commit> [--] [<path>...]::
  62
  63         This is to view the changes between two arbitrary
  64         <commit>.
  65
  66 'git diff' [<options>] <commit>..<commit> [--] [<path>...]::
  67
  68         This is synonymous to the previous form.  If <commit> on
  69         one side is omitted, it will have the same effect as
  70         using HEAD instead.
  71
  72 'git diff' [<options>] <commit> <commit>... <commit> [--] [<path>...]::
  73
  74         This form is to view the results of a merge commit.  The first
  75         listed <commit> must be the merge itself; the remaining two or
  76         more commits should be its parents.  A convenient way to produce
  77         the desired set of revisions is to use the {caret}@ suffix.
  78         For instance, if `master` names a merge commit, `git diff master
  79         master^@` gives the same combined diff as `git show master`.
  80
  81 'git diff' [<options>] <commit>\...<commit> [--] [<path>...]::
  82
  83         This form is to view the changes on the branch containing
  84         and up to the second <commit>, starting at a common ancestor
  85         of both <commit>.  "git diff A\...B" is equivalent to
  86         "git diff $(git merge-base A B) B".  You can omit any one
  87         of <commit>, which has the same effect as using HEAD instead.
  88
  89 Just in case you are doing something exotic, it should be
  90 noted that all of the <commit> in the above description, except
  91 in the last two forms that use ".." notations, can be any
  92 <tree>.
  93
  94 For a more complete list of ways to spell <commit>, see
  95 "SPECIFYING REVISIONS" section in linkgit:gitrevisions[7].
  96 However, "diff" is about comparing two _endpoints_, not ranges,
  97 and the range notations ("<commit>..<commit>" and
  98 "<commit>\...<commit>") do not mean a range as defined in the
  99 "SPECIFYING RANGES" section in linkgit:gitrevisions[7].
 100
 101 'git diff' [<options>] <blob> <blob>::
 102
 103         This form is to view the differences between the raw
 104         contents of two blob objects.
 105
 106 OPTIONS
 107 -------
 108 :git-diff: 1
 109 include::diff-options.txt[]
 110
 111 -1 --base::
 112 -2 --ours::
 113 -3 --theirs::
 114         Compare the working tree with the "base" version (stage #1),
 115         "our branch" (stage #2) or "their branch" (stage #3).  The
 116         index contains these stages only for unmerged entries i.e.
 117         while resolving conflicts.  See linkgit:git-read-tree[1]
 118         section "3-Way Merge" for detailed information.
 119
 120 -0::
 121         Omit diff output for unmerged entries and just show
 122         "Unmerged".  Can be used only when comparing the working tree
 123         with the index.
 124
 125 <path>...::
 126         The <paths> parameters, when given, are used to limit
 127         the diff to the named paths (you can give directory
 128         names and get diff for all files under them).
 129
 130
 131 include::diff-format.txt[]
 132
 133 EXAMPLES
 134 --------
 135
 136 Various ways to check your working tree::
 137 +
 138 ------------
 139 $ git diff            <1>
 140 $ git diff --cached   <2>
 141 $ git diff HEAD       <3>
 142 ------------
 143 +
 144 <1> Changes in the working tree not yet staged for the next commit.
 145 <2> Changes between the index and your last commit; what you
 146     would be committing if you run "git commit" without "-a" option.
 147 <3> Changes in the working tree since your last commit; what you
 148     would be committing if you run "git commit -a"
 149
 150 Comparing with arbitrary commits::
 151 +
 152 ------------
 153 $ git diff test            <1>
 154 $ git diff HEAD -- ./test  <2>
 155 $ git diff HEAD^ HEAD      <3>
 156 ------------
 157 +
 158 <1> Instead of using the tip of the current branch, compare with the
 159     tip of "test" branch.
 160 <2> Instead of comparing with the tip of "test" branch, compare with
 161     the tip of the current branch, but limit the comparison to the
 162     file "test".
 163 <3> Compare the version before the last commit and the last commit.
 164
 165 Comparing branches::
 166 +
 167 ------------
 168 $ git diff topic master    <1>
 169 $ git diff topic..master   <2>
 170 $ git diff topic...master  <3>
 171 ------------
 172 +
 173 <1> Changes between the tips of the topic and the master branches.
 174 <2> Same as above.
 175 <3> Changes that occurred on the master branch since when the topic
 176     branch was started off it.
 177
 178 Limiting the diff output::
 179 +
 180 ------------
 181 $ git diff --diff-filter=MRC            <1>
 182 $ git diff --name-status                <2>
 183 $ git diff arch/i386 include/asm-i386   <3>
 184 ------------
 185 +
 186 <1> Show only modification, rename, and copy, but not addition
 187     or deletion.
 188 <2> Show only names and the nature of change, but not actual
 189     diff output.
 190 <3> Limit diff output to named subtrees.
 191
 192 Munging the diff output::
 193 +
 194 ------------
 195 $ git diff --find-copies-harder -B -C  <1>
 196 $ git diff -R                          <2>
 197 ------------
 198 +
 199 <1> Spend extra cycles to find renames, copies and complete
 200     rewrites (very expensive).
 201 <2> Output diff in reverse.
 202
 203 SEE ALSO
 204 --------
 205 diff(1),
 206 linkgit:git-difftool[1],
 207 linkgit:git-log[1],
 208 linkgit:gitdiffcore[7],
 209 linkgit:git-format-patch[1],
 210 linkgit:git-apply[1],
 211 linkgit:git-show[1]
 212
 213 GIT
 214 ---
 215 Part of the linkgit:git[1] suite