diff options
author | Junio C Hamano <gitster@pobox.com> | 2023-09-14 11:17:00 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-09-14 11:17:00 -0700 |
commit | 18ad82232f283683612dce2231fcc297d2fcbf5e (patch) | |
tree | 3c6cad2f39cc5860a42480fea8b9673e0207eb0e /Documentation/diff-options.txt | |
parent | b995e78147d0ec6bf3af4a7c31e41535409102da (diff) | |
parent | 11422f23e3ed0efc60288e92a77c42c8fa6c1483 (diff) | |
download | git-18ad82232f283683612dce2231fcc297d2fcbf5e.tar.gz |
Merge branch 'so/diff-doc-for-patch-update'
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
Diffstat (limited to 'Documentation/diff-options.txt')
-rw-r--r-- | Documentation/diff-options.txt | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 9f33f88771..c07488b123 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -22,13 +22,7 @@ ifndef::git-format-patch[] -p:: -u:: --patch:: - Generate patch (see section titled -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[] + Generate patch (see <<generate_patch_text_with_p>>). ifdef::git-diff[] This is the default. endif::git-diff[] |