From 2cf565c53c88c557eedd7e5629437b3c6fe74329 Mon Sep 17 00:00:00 2001 From: David Greaves Date: Tue, 10 May 2005 22:32:30 +0100 Subject: [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 --- Documentation/diff-format.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'Documentation/diff-format.txt') diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt index 3af197cd2c..1a99e85ee5 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/ -L a/ -pu ++ +For added files, `/dev/null` is used for . For removed +files, `/dev/null` is used for ++ +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 . For removed - files, `/dev/null` is used for - - 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 -- cgit v1.3-6-g1900