diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-07-04 06:41:40 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-07-04 06:41:40 +0000 |
| commit | bb0f404400efdcb2661c4e23e54c335fd41d2031 (patch) | |
| tree | bf8bca8d7c9e5f7960c7a337e6c52f52e490c644 /diff-options.txt | |
| parent | 1d90cb06fff9524ece5485f8d716da466af822d7 (diff) | |
| download | git-htmldocs-bb0f404400efdcb2661c4e23e54c335fd41d2031.tar.gz | |
Autogenerated HTML docs for v1.5.3-rc0-11-ge2b1a
Diffstat (limited to 'diff-options.txt')
| -rw-r--r-- | diff-options.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/diff-options.txt b/diff-options.txt index 0f07c9c4a..3d2b9d0a0 100644 --- a/diff-options.txt +++ b/diff-options.txt @@ -168,5 +168,13 @@ --quiet:: Disable all output of the program. Implies --exit-code. +--ext-diff:: + Allow an external diff helper to be executed. If you set an + external diff driver with gitlink:gitattributes(5), you need + to use this option with gitlink:git-log(1) and friends. + +--no-ext-diff:: + Disallow external diff drivers. + For more detailed explanation on these common options, see also link:diffcore.html[diffcore documentation]. |