projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GIT 0.99.9c
[git.git]
/
Documentation
/
diff-format.txt
diff --git
a/Documentation/diff-format.txt
b/Documentation/diff-format.txt
index
6e9fa8c
..
d1d0d2d
100644
(file)
--- a/
Documentation/diff-format.txt
+++ b/
Documentation/diff-format.txt
@@
-1,8
+1,8
@@
The output format from "git-diff-index", "git-diff-tree" and
"git-diff-files" are very similar.
The output format from "git-diff-index", "git-diff-tree" and
"git-diff-files" are very similar.
-These commands all compare two sets of things; what
are
-compared
are different
:
+These commands all compare two sets of things; what
is
+compared
differs
:
git-diff-index <tree-ish>::
compares the <tree-ish> and the files on the filesystem.
git-diff-index <tree-ish>::
compares the <tree-ish> and the files on the filesystem.
@@
-46,7
+46,7
@@
That is, from the left to the right:
. path for "dst"; only exists for C or R.
. an LF or a NUL when '-z' option is used, to terminate the record.
. path for "dst"; only exists for C or R.
. an LF or a NUL when '-z' option is used, to terminate the record.
-<sha1> is shown as all 0's if
new is a file
on the filesystem
+<sha1> is shown as all 0's if
a file is new
on the filesystem
and it is out of sync with the cache.
Example:
and it is out of sync with the cache.
Example:
@@
-55,6
+55,11
@@
Example:
:100644 100644 5be4a4...... 000000...... M file.c
------------------------------------------------
:100644 100644 5be4a4...... 000000...... M file.c
------------------------------------------------
+When `-z` option is not used, TAB, LF, and backslash characters
+in pathnames are represented as `\t`, `\n`, and `\\`,
+respectively.
+
+
Generating patches with -p
--------------------------
Generating patches with -p
--------------------------
@@
-91,7
+96,7
@@
For a path that is added, removed, or modified,
where:
<old|new>-file:: are files GIT_EXTERNAL_DIFF can use to read the
where:
<old|new>-file:: are files GIT_EXTERNAL_DIFF can use to read the
- contents of <old|ne>,
+ contents of <old|ne
w
>,
<old|new>-hex:: are the 40-hexdigit SHA1 hashes,
<old|new>-mode:: are the octal representation of the file modes.
<old|new>-hex:: are the 40-hexdigit SHA1 hashes,
<old|new>-mode:: are the octal representation of the file modes.
@@
-106,7
+111,7
@@
For a path that is unmerged, 'GIT_EXTERNAL_DIFF' is called with 1
parameter, <path>.
parameter, <path>.
-
G
it specific extension to diff format
+
g
it specific extension to diff format
-------------------------------------
What -p option produces is slightly different from the
-------------------------------------
What -p option produces is slightly different from the
@@
-121,12
+126,11
@@
The `a/` and `b/` filenames are the same unless rename/copy is
involved. Especially, even for a creation or a deletion,
`/dev/null` is _not_ used in place of `a/` or `b/` filenames.
+
involved. Especially, even for a creation or a deletion,
`/dev/null` is _not_ used in place of `a/` or `b/` filenames.
+
-When rename/copy is involved, `file1` and `file2` show
s
the
+When rename/copy is involved, `file1` and `file2` show the
name of the source file of the rename/copy and the name of
the file that rename/copy produces, respectively.
name of the source file of the rename/copy and the name of
the file that rename/copy produces, respectively.
-2. It is followed by extended header lines that are one or
- more of:
+2. It is followed by one or more extended header lines:
old mode <mode>
new mode <mode>
old mode <mode>
new mode <mode>
@@
-138,3
+142,7
@@
the file that rename/copy produces, respectively.
rename to <path>
similarity index <number>
dissimilarity index <number>
rename to <path>
similarity index <number>
dissimilarity index <number>
+ index <hash>..<hash> <mode>
+
+3. TAB, LF, and backslash characters in pathnames are
+ represented as `\t`, `\n`, and `\\`, respectively.