← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/git-core/intrepid-updates

« back to all changes in this revision

Viewing changes to Documentation/diffcore.txt

  • Committer: Package Import Robot
  • Author(s): Gerrit Pape
  • Date: 2007-04-22 13:31:05 UTC
  • mfrom: (1.1.14)
  • Revision ID: package-import@ubuntu.com-20070422133105-tkmhz328g2p0epz1
Tags: 1:1.5.1.2-1
* new upstream point release.
* debian/changelog.upstream: upstream changes taken from mailing list
  announcement.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Documentation/diffcore.txt
6
6
Introduction
7
7
------------
8
8
 
9
 
The diff commands git-diff-index, git-diff-files, git-diff-tree, and
10
 
git-diff-stages can be told to manipulate differences they find in
 
9
The diff commands git-diff-index, git-diff-files, and git-diff-tree
 
10
can be told to manipulate differences they find in
11
11
unconventional ways before showing diff(1) output.  The manipulation
12
12
is collectively called "diffcore transformation".  This short note
13
13
describes what they are and how to use them to produce diff outputs
30
30
 
31
31
 - git-diff-tree compares contents of two "tree" objects;
32
32
 
33
 
 - git-diff-stages compares contents of blobs at two stages in an
34
 
   unmerged index file.
35
 
 
36
33
In all of these cases, the commands themselves compare
37
34
corresponding paths in the two sets of files.  The result of
38
35
comparison is passed from these commands to what is internally