diff options
| author | Anders Melchiorsen <mail@cup.kalibalik.dk> | 2008-07-27 13:12:15 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-27 14:14:00 -0700 |
| commit | 6bb9e51b8ef2f397f9f44cfaeaa120ca0cc741e6 (patch) | |
| tree | 9bcd813a927c04d550c8e31ac2350e5ee5ed4aca /Documentation/git-config.txt | |
| parent | cbb504c97437653540dc55430a6f64da9ddd24fd (diff) | |
| download | git-6bb9e51b8ef2f397f9f44cfaeaa120ca0cc741e6.tar.gz | |
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 <mail@cup.kalibalik.dk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-config.txt')
| -rw-r--r-- | Documentation/git-config.txt | 2 |
1 files changed, 1 insertions, 1 deletions
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 |