summaryrefslogtreecommitdiffstats
path: root/diff-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2007-07-26 02:14:34 +0000
committerJunio C Hamano <junio@hera.kernel.org>2007-07-26 02:14:34 +0000
commit6936156b92bf31acd8e14b74ddf5b83a59de50f6 (patch)
tree1e402b9e1e1f00a05c4669c906358a2e78203c29 /diff-options.txt
parenta3770f9d55168c4d4ab437414e20475790e02e3a (diff)
downloadgit-htmldocs-6936156b92bf31acd8e14b74ddf5b83a59de50f6.tar.gz
Autogenerated HTML docs for v1.5.3-rc3-7-gd58e
Diffstat (limited to 'diff-options.txt')
-rw-r--r--diff-options.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/diff-options.txt b/diff-options.txt
index 3d2b9d0a0..82165763b 100644
--- a/diff-options.txt
+++ b/diff-options.txt
@@ -4,6 +4,13 @@
-u::
Synonym for "-p".
+-U<n>::
+ Shorthand for "--unified=<n>".
+
+--unified=<n>::
+ Generate diffs with <n> lines of context instead of
+ the usual three. Implies "-p".
+
--raw::
Generate the raw format.