diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2005-08-05 15:05:02 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-08-06 06:07:00 (GMT) |
| commit | 2c6e4771959dbe8116f39587d912f1215c06cd0d (patch) | |
| tree | 4a0507fb450fc5c74ecc489701917f188a0a5077 /Documentation/diff-format.txt | |
| parent | eca35ecdcaa1448de8cc9ec64590f47a9012264a (diff) | |
| download | git-2c6e4771959dbe8116f39587d912f1215c06cd0d.zip git-2c6e4771959dbe8116f39587d912f1215c06cd0d.tar.gz git-2c6e4771959dbe8116f39587d912f1215c06cd0d.tar.bz2 | |
[PATCH] Assorted documentation patches
[jc: Johannes spent time and effort to see how consistent our
use of terminilogy is, and as a byproduct made these corrections
not related to the terminology unification. I really appreciate
it.]
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/diff-format.txt')
| -rw-r--r-- | Documentation/diff-format.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt index d6ce035..9298d79 100644 --- 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: - 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> @@ -101,7 +101,7 @@ For a path that is unmerged, 'GIT_EXTERNAL_DIFF' is called with 1 parameter, <path>. -Git specific extention to diff format +Git specific extension to diff format ------------------------------------- What -p option produces is slightly different from the |