aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Rosenberg <robin.rosenberg@dewire.com>2007-07-25 12:08:17 +0200
committerJunio C Hamano <gitster@pobox.com>2007-07-25 13:27:26 -0700
commit4eb994733d75d40cab87e7b4736166cf33e7787a (patch)
tree3db874e7a0406460a7ab33af69e640300f7ae178
parentf48a203a563ae8a46daa8b8923b5d81dc40502fb (diff)
downloadgit-4eb994733d75d40cab87e7b4736166cf33e7787a.tar.gz
git-4eb994733d75d40cab87e7b4736166cf33e7787a.tar.xz
Document --unified/-U option
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/diff-options.txt7
1 files changed, 7 insertions, 0 deletions
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.