{"thread":{"id":"16116","subject":"[PATCH] Documentation/gitattributes: Add subsection header for each attribute","startedAt":"2008-10-31T22:24:55Z","lastAt":"2008-10-31T22:24:55Z","messageCount":1,"participants":["Jakub Narebski"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"94477","messageId":"1225491895-31987-1-git-send-email-jnareb@gmail.com","threadId":"16116","inReplyTo":null,"subject":"[PATCH] Documentation/gitattributes: Add subsection header for each attribute","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2008-10-31T22:24:55Z","receivedAt":"2008-10-31T22:24:55Z","isPatch":true,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"This makes attributes easier to find; before this patch some\nattributes had individual subsections, and some didn't.\n\nSigned-off-by: Jakub Narebski <jnareb@gmail.com>\n---\n Documentation/gitattributes.txt |    6 ++++++\n 1 files changed, 6 insertions(+), 0 deletions(-)\n\ndiff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt\nindex 24e880c..eb64841 100644\n--- a/Documentation/gitattributes.txt\n+++ b/Documentation/gitattributes.txt\n@@ -213,6 +213,9 @@ with `crlf`, and then `ident` and fed to `filter`.\n Generating diff text\n ~~~~~~~~~~~~~~~~~~~~\n \n+`diff`\n+^^^^^^\n+\n The attribute `diff` affects if 'git-diff' generates textual\n patch for the path or just says `Binary files differ`.  It also\n can affect what line is shown on the hunk header `@@ -k,l +n,m @@`\n@@ -331,6 +334,9 @@ patterns are available:\n Performing a three-way merge\n ~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n \n+`merge`\n+^^^^^^^\n+\n The attribute `merge` affects how three versions of a file is\n merged when a file-level merge is necessary during `git merge`,\n and other programs such as `git revert` and `git cherry-pick`.\n-- \n1.6.0.3\n"}]}