diff options
Diffstat (limited to 'Documentation/diff-context-options.adoc')
| -rw-r--r-- | Documentation/diff-context-options.adoc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/diff-context-options.adoc b/Documentation/diff-context-options.adoc index e161260358..b9ace2aa4b 100644 --- a/Documentation/diff-context-options.adoc +++ b/Documentation/diff-context-options.adoc @@ -1,7 +1,9 @@ `-U<n>`:: `--unified=<n>`:: - Generate diffs with _<n>_ lines of context. Defaults to `diff.context` - or 3 if the config option is unset. + Generate diffs with _<n>_ lines of context. The number of context + lines defaults to `diff.context` or 3 if the configuration variable + is unset. (`-U` without `<n>` is silently accepted as a synonym for + `-p` due to a historical accident). `--inter-hunk-context=<n>`:: Show the context between diff hunks, up to the specified _<number>_ |