summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-19 17:49:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-10-19 17:49:13 (GMT)
commit9b55aa03daebf43067021b7d58abea249229987b (patch)
tree1ca8767031f5f0968d8bc96bb8c2b192b7b94a9b /Documentation
parent662384c4996c7bc46322dc6d4f5afafa6e069d40 (diff)
parent14937c2c06e63f93f65e1bc6693b95d4e54053d7 (diff)
downloadgit-9b55aa03daebf43067021b7d58abea249229987b.zip
git-9b55aa03daebf43067021b7d58abea249229987b.tar.gz
git-9b55aa03daebf43067021b7d58abea249229987b.tar.bz2
Merge branch 'rs/diff-whole-function'
* rs/diff-whole-function: diff: add option to show whole functions as context xdiff: factor out get_func_line()
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/diff-options.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 5c53bdb..08b581f 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -408,6 +408,10 @@ endif::git-format-patch[]
Show the context between diff hunks, up to the specified number
of lines, thereby fusing hunks that are close to each other.
+-W::
+--function-context::
+ Show whole surrounding functions of changes.
+
ifndef::git-format-patch[]
--exit-code::
Make the program exit with codes similar to diff(1).