Documentation / git-diff-tree.txton commit Merge /pub/scm/git/git to recover lost side branch (bfadbed)
   1git-diff-tree(1)
   2================
   3
   4NAME
   5----
   6git-diff-tree - Compares the content and mode of blobs found via two tree objects
   7
   8
   9SYNOPSIS
  10--------
  11'git-diff-tree' [--stdin] [-m] [-s] [-v] [--pretty] [-t] [<common diff options>] <tree-ish> [<tree-ish>] [<path>...]
  12
  13DESCRIPTION
  14-----------
  15Compares the content and mode of the blobs found via two tree objects.
  16
  17If there is only one <tree-ish> given, the commit is compared with its parents
  18(see --stdin below).
  19
  20Note that "git-diff-tree" can use the tree encapsulated in a commit object.
  21
  22OPTIONS
  23-------
  24include::diff-options.txt[]
  25
  26<tree-ish>::
  27        The id of a tree object.
  28
  29<path>...::
  30        If provided, the results are limited to a subset of files
  31        matching one of these prefix strings.
  32        ie file matches `/^<pattern1>|<pattern2>|.../`
  33        Note that this parameter does not provide any wildcard or regexp
  34        features.
  35
  36-t::
  37        show tree entry itself as well as subtrees.  Implies -r.
  38
  39--root::
  40        When '--root' is specified the initial commit will be showed as a big
  41        creation event. This is equivalent to a diff against the NULL tree.
  42
  43--stdin::
  44        When '--stdin' is specified, the command does not take
  45        <tree-ish> arguments from the command line.  Instead, it
  46        reads either one <commit> or a pair of <tree-ish>
  47        separated with a single space from its standard input.
  48+
  49When a single commit is given on one line of such input, it compares
  50the commit with its parents.  The following flags further affects its
  51behaviour.  This does not apply to the case where two <tree-ish>
  52separated with a single space are given.
  53
  54-m::
  55        By default, "git-diff-tree --stdin" does not show
  56        differences for merge commits.  With this flag, it shows
  57        differences to that commit from all of its parents.
  58
  59-s::
  60        By default, "git-diff-tree --stdin" shows differences,
  61        either in machine-readable form (without '-p') or in patch
  62        form (with '-p').  This output can be supressed.  It is
  63        only useful with '-v' flag.
  64
  65-v::
  66        This flag causes "git-diff-tree --stdin" to also show
  67        the commit message before the differences.
  68
  69--pretty[=(raw|medium|short)]::
  70        This is used to control "pretty printing" format of the
  71        commit message.  Without "=<style>", it defaults to
  72        medium.
  73
  74
  75Limiting Output
  76---------------
  77If you're only interested in differences in a subset of files, for
  78example some architecture-specific files, you might do:
  79
  80        git-diff-tree -r <tree-ish> <tree-ish> arch/ia64 include/asm-ia64
  81
  82and it will only show you what changed in those two directories.
  83
  84Or if you are searching for what changed in just `kernel/sched.c`, just do
  85
  86        git-diff-tree -r <tree-ish> <tree-ish> kernel/sched.c
  87
  88and it will ignore all differences to other files.
  89
  90The pattern is always the prefix, and is matched exactly.  There are no
  91wildcards.  Even stricter, it has to match a complete path component.
  92I.e. "foo" does not pick up `foobar.h`.  "foo" does match `foo/bar.h`
  93so it can be used to name subdirectories.
  94
  95An example of normal usage is:
  96
  97  torvalds@ppc970:~/git> git-diff-tree 5319e4......
  98  *100664->100664 blob    ac348b.......->a01513.......      git-fsck-objects.c
  99
 100which tells you that the last commit changed just one file (it's from
 101this one:
 102
 103-----------------------------------------------------------------------------
 104commit 3c6f7ca19ad4043e9e72fa94106f352897e651a8
 105tree 5319e4d609cdd282069cc4dce33c1db559539b03
 106parent b4e628ea30d5ab3606119d2ea5caeab141d38df7
 107author Linus Torvalds <torvalds@ppc970.osdl.org> Sat Apr 9 12:02:30 2005
 108committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat Apr 9 12:02:30 2005
 109
 110Make "git-fsck-objects" print out all the root commits it finds.
 111
 112Once I do the reference tracking, I'll also make it print out all the
 113HEAD commits it finds, which is even more interesting.
 114-----------------------------------------------------------------------------
 115
 116in case you care).
 117
 118Output format
 119-------------
 120include::diff-format.txt[]
 121
 122
 123Author
 124------
 125Written by Linus Torvalds <torvalds@osdl.org>
 126
 127Documentation
 128--------------
 129Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
 130
 131GIT
 132---
 133Part of the gitlink:git[7] suite
 134