On Mon, Apr 4, 2016 at 3:32 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Eric Sunshine <sunshine@xxxxxxxxxxxxxx> writes: >> diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt >> @@ -28,10 +28,12 @@ ifdef::git-diff[] >> endif::git-diff[] >> endif::git-format-patch[] >> >> +ifndef::git-format-patch[] >> -s:: >> --no-patch:: >> Suppress diff output. Useful for commands like `git show` that >> show the patch by default, or to cancel the effect of `--patch`. >> +endif::git-format-patch[] > > Given that the ifndef/endif block immediately before this part is > also about excluding -p/-u/--patch when formatting the documentation > for format-patch, perhaps the attached may be a smaller equivalent? Perhaps. I kept self-contained to make it easier to add new options between the two if need be, but I don't feel strongly about it. > Documentation/diff-options.txt | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt > index 306b7e3..42e6620 100644 > --- a/Documentation/diff-options.txt > +++ b/Documentation/diff-options.txt > @@ -26,12 +26,12 @@ ifndef::git-format-patch[] > ifdef::git-diff[] > This is the default. > endif::git-diff[] > -endif::git-format-patch[] > > -s:: > --no-patch:: > Suppress diff output. Useful for commands like `git show` that > show the patch by default, or to cancel the effect of `--patch`. > +endif::git-format-patch[] > > -U<n>:: > --unified=<n>:: -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html