projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
trivial: clarify, what are the config's user.name and user.email about
[git.git]
/
Documentation
/
diff-format.txt
diff --git
a/Documentation/diff-format.txt
b/Documentation/diff-format.txt
index
b426a14
..
0398b40
100644
(file)
--- a/
Documentation/diff-format.txt
+++ b/
Documentation/diff-format.txt
@@
-81,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
@@
-117,7
+117,7
@@
git specific extension to diff format
What -p option produces is slightly different from the
traditional diff format.
What -p option produces is slightly different from the
traditional diff format.
-1. It is prece
e
ded with a "git diff" header, that looks like
+1. It is preceded with a "git diff" header, that looks like
this:
diff --git a/file1 b/file2
this:
diff --git a/file1 b/file2