summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-05-07 12:47:38 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-05-07 12:47:38 +0900
commite60e9cc20ea4723b299425271be3a78946659251 (patch)
treef019f0d2c2a82dae8e80c5ea5e99caf0c7a2ad9d /Documentation
parentMerge branch 'hn/trace-reflog-expiry' (diff)
parentdoc: point to diff attribute in patch format docs (diff)
downloadtgif-e60e9cc20ea4723b299425271be3a78946659251.tar.xz
Merge branch 'po/diff-patch-doc'
Doc update. * po/diff-patch-doc: doc: point to diff attribute in patch format docs
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/diff-generate-patch.txt7
1 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/diff-generate-patch.txt b/Documentation/diff-generate-patch.txt
index 2db8eacc3e..c78063d4f7 100644
--- a/Documentation/diff-generate-patch.txt
+++ b/Documentation/diff-generate-patch.txt
@@ -11,7 +11,7 @@ linkgit:git-diff-files[1]
with the `-p` option produces patch text.
You can customize the creation of patch text via the
`GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables
-(see linkgit:git[1]).
+(see linkgit:git[1]), and the `diff` attribute (see linkgit:gitattributes[5]).
What the -p option produces is slightly different from the traditional
diff format:
@@ -74,6 +74,11 @@ separate lines indicate the old and the new mode.
rename from b
rename to a
+5. Hunk headers mention the name of the function to which the hunk
+ applies. See "Defining a custom hunk-header" in
+ linkgit:gitattributes[5] for details of how to tailor to this to
+ specific languages.
+
Combined diff format
--------------------