diff options
| author | David Greaves <david@dgreaves.com> | 2005-05-10 22:32:30 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-05-10 14:55:22 -0700 |
| commit | 2cf565c53c88c557eedd7e5629437b3c6fe74329 (patch) | |
| tree | bb04b39cf3fef50bc05825d953486a4d6bada056 /Documentation/diff-format.txt | |
| parent | 3be4b61aa4ffb54a42c717772518b2a14b1e352b (diff) | |
| download | git-2cf565c53c88c557eedd7e5629437b3c6fe74329.tar.gz git-2cf565c53c88c557eedd7e5629437b3c6fe74329.tar.xz | |
[PATCH 1/4] split core-git.txt and update
Split the core-git.txt file
Formatting fix to the diff-format.txt
Signed-off-by: David Greaves <david@dgreaves.com>
Diffstat (limited to 'Documentation/diff-format.txt')
| -rw-r--r-- | Documentation/diff-format.txt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt index 3af197cd2..1a99e85ee 100644 --- a/Documentation/diff-format.txt +++ b/Documentation/diff-format.txt @@ -51,15 +51,15 @@ customization also applies to "git-diff-tree-helper". these commands internally invoke "diff" like this: diff -L a/<path> -L a/<path> -pu <old> <new> ++ +For added files, `/dev/null` is used for <old>. For removed +files, `/dev/null` is used for <new> ++ +The "diff" formatting options can be customized via the +environment variable 'GIT_DIFF_OPTS'. For example, if you +prefer context diff: - For added files, `/dev/null` is used for <old>. For removed - files, `/dev/null` is used for <new> - - The "diff" formatting options can be customized via the - environment variable 'GIT_DIFF_OPTS'. For example, if you - prefer context diff: - - GIT_DIFF_OPTS=-c git-diff-cache -p $(cat .git/HEAD) + GIT_DIFF_OPTS=-c git-diff-cache -p $(cat .git/HEAD) 2. When the environment variable 'GIT_EXTERNAL_DIFF' is set, the |