diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-05-07 12:47:38 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-05-07 12:47:38 +0900 |
| commit | e60e9cc20ea4723b299425271be3a78946659251 (patch) | |
| tree | f019f0d2c2a82dae8e80c5ea5e99caf0c7a2ad9d | |
| parent | a850356d1b29ad915acb9f9e144867e90db16da3 (diff) | |
| parent | 7a14acdbe6ff9934da6efd7d165dee4d205ec8fb (diff) | |
| download | git-e60e9cc20ea4723b299425271be3a78946659251.tar.gz | |
Merge branch 'po/diff-patch-doc'
Doc update.
* po/diff-patch-doc:
doc: point to diff attribute in patch format docs
| -rw-r--r-- | Documentation/diff-generate-patch.txt | 7 |
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 -------------------- |