summaryrefslogtreecommitdiff
path: root/Documentation/diff-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-11-08 16:38:14 -0800
committerJunio C Hamano <gitster@pobox.com>2011-11-08 16:38:14 -0800
commit14ba45a2e68c296cb2b5bc5e77fdaa0846fb77de (patch)
tree50908aa6bd9e8d577a5702368a04e07a89612ec4 /Documentation/diff-options.txt
parent4cb6764227173a6483edbdad09121651bc0b01c3 (diff)
parentd4d5ab4727edd1758157dd0b61c1ff3b7deabfcd (diff)
downloadgit-14ba45a2e68c296cb2b5bc5e77fdaa0846fb77de.tar.gz
Sync with 1.7.7.3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/diff-options.txt')
-rw-r--r--Documentation/diff-options.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 08b581f040..9f7cba2be6 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -413,6 +413,7 @@ endif::git-format-patch[]
Show whole surrounding functions of changes.
ifndef::git-format-patch[]
+ifndef::git-log[]
--exit-code::
Make the program exit with codes similar to diff(1).
That is, it exits with 1 if there were differences and
@@ -420,6 +421,7 @@ ifndef::git-format-patch[]
--quiet::
Disable all output of the program. Implies `--exit-code`.
+endif::git-log[]
endif::git-format-patch[]
--ext-diff::