projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introduce i18n.commitencoding.
[git.git]
/
Documentation
/
diff-format.txt
diff --git
a/Documentation/diff-format.txt
b/Documentation/diff-format.txt
index
bfe634d
..
97756ec
100644
(file)
--- a/
Documentation/diff-format.txt
+++ b/
Documentation/diff-format.txt
@@
-8,13
+8,13
@@
git-diff-index <tree-ish>::
compares the <tree-ish> and the files on the filesystem.
git-diff-index --cached <tree-ish>::
compares the <tree-ish> and the files on the filesystem.
git-diff-index --cached <tree-ish>::
- compares the <tree-ish> and the
cache
.
+ compares the <tree-ish> and the
index
.
git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>...]::
compares the trees named by the two arguments.
git-diff-files [<pattern>...]::
git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>...]::
compares the trees named by the two arguments.
git-diff-files [<pattern>...]::
- compares the
cache
and the files on the filesystem.
+ compares the
index
and the files on the filesystem.
An output line is formatted this way:
An output line is formatted this way:
@@
-47,7
+47,7
@@
That is, from the left to the right:
. an LF or a NUL when '-z' option is used, to terminate the record.
<sha1> is shown as all 0's if a file is new on the filesystem
. an LF or a NUL when '-z' option is used, to terminate the record.
<sha1> is shown as all 0's if a file is new on the filesystem
-and it is out of sync with the
cache
.
+and it is out of sync with the
index
.
Example:
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
--------------------------
@@
-76,7
+81,7
@@
The "diff" formatting options can be customized via the
environment variable 'GIT_DIFF_OPTS'. For example, if you
prefer context diff:
environment variable 'GIT_DIFF_OPTS'. For example, if you
prefer context diff:
- GIT_DIFF_OPTS=-c git-diff-index -p
$(cat .git/HEAD)
+ GIT_DIFF_OPTS=-c git-diff-index -p
HEAD
2. When the environment variable 'GIT_EXTERNAL_DIFF' is set, the
2. When the environment variable 'GIT_EXTERNAL_DIFF' is set, the
@@
-99,7
+104,7
@@
where:
The file parameters can point at the user's working file
(e.g. `new-file` in "git-diff-files"), `/dev/null` (e.g. `old-file`
when a new file is added), or a temporary file (e.g. `old-file` in the
The file parameters can point at the user's working file
(e.g. `new-file` in "git-diff-files"), `/dev/null` (e.g. `old-file`
when a new file is added), or a temporary file (e.g. `old-file` in the
-
cache
). 'GIT_EXTERNAL_DIFF' should not worry about unlinking the
+
index
). 'GIT_EXTERNAL_DIFF' should not worry about unlinking the
temporary file --- it is removed when 'GIT_EXTERNAL_DIFF' exits.
For a path that is unmerged, 'GIT_EXTERNAL_DIFF' is called with 1
temporary file --- it is removed when 'GIT_EXTERNAL_DIFF' exits.
For a path that is unmerged, 'GIT_EXTERNAL_DIFF' is called with 1
@@
-137,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.