Merge branch 'js/etc-config'

diff --git a/Documentation/git-show.txt b/Documentation/git-show.txt
index 9051951c34c41cf339df1f54319addf62318f5d6..f56f16498398405a170c29543efc44a08e388c49 100644 (file)
--- a/Documentation/git-show.txt
+++ b/Documentation/git-show.txt
@@ -25,6 +25,9 @@ with \--name-only).
 
 For plain blobs, it shows the plain contents.
 
+The command takes options applicable to the gitlink:git-diff-tree[1] command to
+control how the changes the commit introduces are shown.
+
 This manual page describes only the most frequently used options.