summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Matthieu Moy <Matthieu.Moy@imag.fr>2013-07-16 10:05:38 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-07-17 17:50:56 -0700
commit0791ab02c2e81e3d3c6815ce36085072d2c4cb4d (patch)
treee053996507698b103524985a60f2add8ec4d3117 /Documentation
parentdiff: allow --patch & cie to override -s/--no-patch (diff)
downloadtgif-0791ab02c2e81e3d3c6815ce36085072d2c4cb4d.tar.xz
Documentation/git-show.txt: include common diff options, like git-log.txt
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-show.txt9
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/git-show.txt b/Documentation/git-show.txt
index ae4edcccfb..4e617e6979 100644
--- a/Documentation/git-show.txt
+++ b/Documentation/git-show.txt
@@ -45,6 +45,15 @@ include::pretty-options.txt[]
include::pretty-formats.txt[]
+COMMON DIFF OPTIONS
+-------------------
+
+:git-log: 1
+include::diff-options.txt[]
+
+include::diff-generate-patch.txt[]
+
+
EXAMPLES
--------