Merge branch 'so/diff-doc-for-patch-update' into maint-2.42
References from description of the `--patch` option in various manual pages have been simplified and improved. * so/diff-doc-for-patch-update: doc/diff-options: fix link to generating patch section
This commit is contained in:
@ -22,13 +22,7 @@ ifndef::git-format-patch[]
|
|||||||
-p::
|
-p::
|
||||||
-u::
|
-u::
|
||||||
--patch::
|
--patch::
|
||||||
Generate patch (see section titled
|
Generate patch (see <<generate_patch_text_with_p>>).
|
||||||
ifdef::git-log[]
|
|
||||||
<<generate_patch_text_with_p, "Generating patch text with -p">>).
|
|
||||||
endif::git-log[]
|
|
||||||
ifndef::git-log[]
|
|
||||||
"Generating patch text with -p").
|
|
||||||
endif::git-log[]
|
|
||||||
ifdef::git-diff[]
|
ifdef::git-diff[]
|
||||||
This is the default.
|
This is the default.
|
||||||
endif::git-diff[]
|
endif::git-diff[]
|
||||||
|
Reference in New Issue
Block a user