From: Robin Rosenberg <robin.rosenberg@dewire.com>
Date: Wed, 25 Jul 2007 10:08:17 +0000 (+0200)
Subject: Document --unified/-U option
X-Git-Tag: v1.5.3-rc4~68
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4eb994733d75d40cab87e7b4736166cf33e7787a;p=git.git

Document --unified/-U option

Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 3d2b9d0a0..82165763b 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/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.