{"thread":{"id":"30487","subject":"Re: [RFC PATCH] Documentation: diff produces patches, which can be 'apply'd","startedAt":"2012-05-09T21:38:22Z","lastAt":"2012-05-09T21:38:22Z","messageCount":1,"participants":["Philip Oakley"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"191240","messageId":"A717EB2D296E40C2AF5A3A19C97C24DA@PhilipOakley","threadId":"30487","inReplyTo":null,"subject":"Re: [RFC PATCH] Documentation: diff produces patches, which can be 'apply'd","fromName":"Philip Oakley","fromEmail":"philipoakley@iee.org","sentAt":"2012-05-09T21:38:22Z","receivedAt":"2012-05-09T21:38:22Z","isPatch":true,"sender":{"key":"philipoakley@iee.email","avatar":"https://avatars.githubusercontent.com/u/914343?v=4"},"body":"With attachment this time. In-text readable copy below.\n\nFrom: \"Philip Oakley\" <philipoakley@iee.org> Sent: Wednesday, May 09, 2012 2:17 PM\n> This attached patch (my first) suggests a couple of small documenation changes for 'diff' based on Junio's supportive comments at\n> http://article.gmane.org/gmane.comp.version-control.git/197282\n> \n> The purpose of the patch is to make users aware of the apply command as a companion to diff.\n> \n> If changing the NAME text is considered inappropriate, the same change could just as easily be applied to the start of the \n> DESCRIPTION.\n> \n> I haven't sorted out using 'send-mail' for patches yet, so I've attached it.\n> The patch was generated with \"git format-patch -M\" as per directions.\n> The patch was on top of tag v1.7.10.msysgit.0 from https://github.com/msysgit/git\n> \n> Comments?\n> \n> Philip\n>\nThis may be white space damaged\n---\nFrom 54824f78e0b8389d506661a7db35b6a7f74d0664 Mon Sep 17 00:00:00 2001\nFrom: Philip Oakley <philipoakley@iee.org>\nDate: Tue, 8 May 2012 17:28:41 +0100\nSubject: [PATCH] Documentation: diff produces patches, which can be 'apply'd\n\nTell users from different work environments that the diff format\nis usually a patch. Tell them the git command to implement such\na patch is 'git apply'.\n\nSigned-off-by: Philip Oakley <philipoakley@iee.org>\n---\n\nIf changing the NAME text is considered inappropriate, the same change\ncould just as easily be applied to the start of the DESCRIPTION.\n\n Documentation/git-diff.txt |    5 +++--\n 1 files changed, 3 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt\nindex f8d0819..b2d2c06 100644\n--- a/Documentation/git-diff.txt\n+++ b/Documentation/git-diff.txt\n@@ -3,7 +3,7 @@ git-diff(1)\n \n NAME\n ----\n-git-diff - Show changes between commits, commit and working tree, etc\n+git-diff - Show changes, usually as a patch, between commits, commit and working tree, etc\n \n \n SYNOPSIS\n@@ -18,7 +18,8 @@ DESCRIPTION\n -----------\n Show changes between the working tree and the index or a tree, changes\n between the index and a tree, changes between two trees, or changes\n-between two files on disk.\n+between two files on disk. You can implement a diff's patch using linkgit:git-apply[1].\n+\n \n 'git diff' [--options] [--] [<path>...]::\n \n-- \n1.7.8.msysgit.0\n\n\n\n>From 54824f78e0b8389d506661a7db35b6a7f74d0664 Mon Sep 17 00:00:00 2001\nFrom: Philip Oakley <philipoakley@iee.org>\nDate: Tue, 8 May 2012 17:28:41 +0100\nSubject: [PATCH] Documentation: diff produces patches, which can be 'apply'd\n\nTell users from different work environments that the diff format\nis usually a patch. Tell them the git command to implement such\na patch is 'git apply'.\n\nSigned-off-by: Philip Oakley <philipoakley@iee.org>\n---\n\nIf changing the NAME text is considered inappropriate, the same change\ncould just as easily be applied to the start of the DESCRIPTION.\n\n Documentation/git-diff.txt |    5 +++--\n 1 files changed, 3 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt\nindex f8d0819..b2d2c06 100644\n--- a/Documentation/git-diff.txt\n+++ b/Documentation/git-diff.txt\n@@ -3,7 +3,7 @@ git-diff(1)\n \n NAME\n ----\n-git-diff - Show changes between commits, commit and working tree, etc\n+git-diff - Show changes, usually as a patch, between commits, commit and working tree, etc\n \n \n SYNOPSIS\n@@ -18,7 +18,8 @@ DESCRIPTION\n -----------\n Show changes between the working tree and the index or a tree, changes\n between the index and a tree, changes between two trees, or changes\n-between two files on disk.\n+between two files on disk. You can implement a diff's patch using linkgit:git-apply[1].\n+\n \n 'git diff' [--options] [--] [<path>...]::\n \n-- \n1.7.8.msysgit.0\n\n"}]}