diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-11-02 10:53:17 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-11-02 10:53:17 +0300 |
| commit | 9a4ae43f0bbdf1b36d40ba9d0efb8d1bc8a9ce4d (patch) | |
| tree | 2ace4f2cc65f3d12a59d231419a49ac1d4e60e45 | |
| parent | a70f725c06bb28c1f79c8e30ea9cdb30c45383d0 (diff) | |
| parent | 11422f23e3ed0efc60288e92a77c42c8fa6c1483 (diff) | |
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
| -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[] |