diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-19 10:49:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-19 10:49:13 -0700 |
| commit | 9b55aa03daebf43067021b7d58abea249229987b (patch) | |
| tree | 1ca8767031f5f0968d8bc96bb8c2b192b7b94a9b /Documentation/diff-options.txt | |
| parent | 662384c4996c7bc46322dc6d4f5afafa6e069d40 (diff) | |
| parent | 14937c2c06e63f93f65e1bc6693b95d4e54053d7 (diff) | |
| download | git-9b55aa03daebf43067021b7d58abea249229987b.tar.gz | |
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/diff-options.txt')
| -rw-r--r-- | Documentation/diff-options.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 5c53bdba94..08b581f040 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). |