"Leon Michalak via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: > diff --git a/Documentation/diff-context-options.adoc b/Documentation/diff-context-options.adoc > new file mode 100644 > index 000000000000..e161260358ff > --- /dev/null > +++ b/Documentation/diff-context-options.adoc > @@ -0,0 +1,10 @@ > +`-U<n>`:: > +`--unified=<n>`:: > + Generate diffs with _<n>_ lines of context. Defaults to `diff.context` > + or 3 if the config option is unset. > + > +`--inter-hunk-context=<n>`:: > + Show the context between diff hunks, up to the specified _<number>_ > + of lines, thereby fusing hunks that are close to each other. > + Defaults to `diff.interHunkContext` or 0 if the config option > + is unset. It might not be trivial to do but I wonder if we cannot do better than this to share more of the same text across manual pages. These two being options understood by `git diff`, we certainly have an existing description for them, no? Other than that, looking good to me. Thanks.
