projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Add Makefile target glossary.html
[git.git]
/
Documentation
/
diff-format.txt
diff --git
a/Documentation/diff-format.txt
b/Documentation/diff-format.txt
index
d6ce035
..
9298d79
100644
(file)
--- a/
Documentation/diff-format.txt
+++ b/
Documentation/diff-format.txt
@@
-62,7
+62,7
@@
customization also applies to "git-diff-helper".
1. When the environment variable 'GIT_EXTERNAL_DIFF' is not set,
these commands internally invoke "diff" like this:
1. When the environment variable 'GIT_EXTERNAL_DIFF' is not set,
these commands internally invoke "diff" like this:
- diff -L a/<path> -L
a
/<path> -pu <old> <new>
+ diff -L a/<path> -L
b
/<path> -pu <old> <new>
+
For added files, `/dev/null` is used for <old>. For removed
files, `/dev/null` is used for <new>
+
For added files, `/dev/null` is used for <old>. For removed
files, `/dev/null` is used for <new>
@@
-101,7
+101,7
@@
For a path that is unmerged, 'GIT_EXTERNAL_DIFF' is called with 1
parameter, <path>.
parameter, <path>.
-Git specific exten
t
ion to diff format
+Git specific exten
s
ion to diff format
-------------------------------------
What -p option produces is slightly different from the
-------------------------------------
What -p option produces is slightly different from the