git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v2] doc: point to diff attribute in patch format docs

From
PGPeter Oliver via GitGitGadget <gitgitgadget@gmail.com>
Date
Apr 27, 2021, 11:02 UTC
Message-ID
<pull.940.v2.git.1619521378282.gitgitgadget@gmail.com>
In-Reply-To
<pull.940.git.1619463549689.gitgitgadget@gmail.com>
From: Peter Oliver <git@mavit.org.uk>

From the documentation for generating patch text with diff-related commands, refer to the documentation for the diff attribute.

This attribute influences the way that patches are generated, but this was previously not mentioned in e.g., the git-diff manpage.

Signed-off-by: Peter Oliver <git@mavit.org.uk>
---
    doc: point to diff attribute in patch format docs
    
    From the documentation for generating patch text with diff-related
    commands, refer to the documentation for the diff attribute.
    
    This attribute influences the way that patches are generated, but this
    was previously not mentioned in e.g., the git-diff manpage.
    
    v2: Mention the specific relevant section of the gitattributes manual.
    Thanks to Junio C Hamano for the suggestion.
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-940%2Fmavit%2Fdiff-gitattributes-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-940/mavit/diff-gitattributes-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/940
Range-diff vs v1:
 1:  6f87f3962b84 ! 1:  191d81ef61a5 doc: point to diff attribute in patch format docs
     @@ Documentation/diff-generate-patch.txt: separate lines indicate the old and the n
             rename to a
       
      +5.  Hunk headers mention the name of the function to which the hunk
     -+    applies.  See linkgit:gitattributes[5] for details of how to tailor
     -+    to this to specific languages.
     ++    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
 Documentation/diff-generate-patch.txt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/Documentation/diff-generate-patch.txt b/Documentation/diff-generate-patch.txt
index 2db8eacc3ec7..c78063d4f74a 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
 --------------------

base-commit: 311531c9de557d25ac087c1637818bd2aad6eb3a
-- 
gitgitgadget
Previous: Peter Oliver
Message 4 of 4 in “doc: point to diff attribute in patch format docs”
  1. doc: point to diff attribute in patch format docsPeter Oliver via GitGitGadget, Apr 26, 2021
  2. Junio C HamanoApr 27, 2021
  3. Peter OliverApr 27, 2021
  4. doc: point to diff attribute in patch format docsPeter Oliver via GitGitGadget, Apr 27, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.