diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-01-22 01:21:58 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-01-22 01:21:58 (GMT) |
| commit | c253d61137d68e11f109ee9fe358aecd21760d3c (patch) | |
| tree | ecac3127b82099e9e537dbcdaa53735ed7f48952 | |
| parent | fc2735f427fdf6c5a46688f3aa9750b82f1058fe (diff) | |
| parent | ebdc46c242ac53d73295ba8953456b571dbad322 (diff) | |
| download | git-c253d61137d68e11f109ee9fe358aecd21760d3c.zip git-c253d61137d68e11f109ee9fe358aecd21760d3c.tar.gz git-c253d61137d68e11f109ee9fe358aecd21760d3c.tar.bz2 | |
Merge branch 'jc/doc-diff-patch.txt'
Doc update.
* jc/doc-diff-patch.txt:
docs: link generating patch sections
| -rw-r--r-- | Documentation/diff-generate-patch.txt | 1 | ||||
| -rw-r--r-- | Documentation/diff-options.txt | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/Documentation/diff-generate-patch.txt b/Documentation/diff-generate-patch.txt index c78063d..546adf7 100644 --- a/Documentation/diff-generate-patch.txt +++ b/Documentation/diff-generate-patch.txt @@ -1,3 +1,4 @@ +[[generate_patch_text_with_p]] Generating patch text with -p ----------------------------- diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 3674ac4..7d73e97 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -22,7 +22,13 @@ ifndef::git-format-patch[] -p:: -u:: --patch:: - Generate patch (see section on generating patches). + 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[] ifdef::git-diff[] This is the default. endif::git-diff[] |