From 6bb9e51b8ef2f397f9f44cfaeaa120ca0cc741e6 Mon Sep 17 00:00:00 2001 From: Anders Melchiorsen Date: Sun, 27 Jul 2008 13:12:15 +0200 Subject: Documentation: fix diff.external example The diff.external examples pass a flag to gnu-diff, but GNU diff does not follow the GIT_EXTERNAL_DIFF interface. Signed-off-by: Anders Melchiorsen Signed-off-by: Junio C Hamano --- Documentation/git-config.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation/git-config.txt') diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt index 697824cbab..28e1861094 100644 --- a/Documentation/git-config.txt +++ b/Documentation/git-config.txt @@ -222,7 +222,7 @@ Given a .git/config like this: ; Our diff algorithm [diff] - external = "/usr/local/bin/gnu-diff -u" + external = /usr/local/bin/diff-wrapper renames = true ; Proxy settings -- cgit v1.2.3