{"thread":{"id":"43210","subject":"[PATCH] Documentation tutorial.txt: Teach the reader about git commit -a -s","startedAt":"2006-11-20T22:30:56Z","lastAt":"2006-11-20T23:03:16Z","messageCount":3,"participants":["Paolo Ciarrocchi","J. Bruce Fields","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"294037","messageId":"4d8e3fd30611201430l6135814yc89f4abdb9044340@mail.gmail.com","threadId":"43210","inReplyTo":null,"subject":"[PATCH] Documentation tutorial.txt: Teach the reader about git commit -a -s","fromName":"Paolo Ciarrocchi","fromEmail":"paolo.ciarrocchi@gmail.com","sentAt":"2006-11-20T22:30:56Z","receivedAt":"2006-11-20T22:30:56Z","isPatch":true,"sender":{"key":"paolo.ciarrocchi@gmail.com","avatar":null},"body":"I think it's important to mention, in the collaboration section,\nthat is possible to use the -s option to add the Signed-off-by\nline\n\nSigned-off-by: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>\n---\n Documentation/tutorial.txt |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt\nindex 554ee0a..402afdf 100644\n--- a/Documentation/tutorial.txt\n+++ b/Documentation/tutorial.txt\n@@ -200,7 +200,7 @@ Bob then makes some changes and commits\n\n ------------------------------------------------\n (edit files)\n-$ git commit -a\n+$ git commit -a (add -s to add Signed-off-by line at the end of the\ncommit message)\n (repeat as necessary)\n ------------------------------------------------\n\n-- \n1.4.4.gef06\n\n\n-- \nPaolo\nhttp://www.linkedin.com/pub/0/132/9a3\n\n\nFrom 1d1eed70816997eeb181a5493cec9f58467bd01e Mon Sep 17 00:00:00 2001\nFrom: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>\nDate: Mon, 20 Nov 2006 23:28:16 +0100\nSubject: [PATCH] Documentation: Teach the reader about git commit -a -s\n\nI think it's important to mention, in the collaboration section,\nthat is possible to use the -s option to add the Signed-off-by\nline\n\nSigned-off-by: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>\n---\n Documentation/tutorial.txt |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt\nindex 554ee0a..402afdf 100644\n--- a/Documentation/tutorial.txt\n+++ b/Documentation/tutorial.txt\n@@ -200,7 +200,7 @@ Bob then makes some changes and commits\n \n ------------------------------------------------\n (edit files)\n-$ git commit -a\n+$ git commit -a (add -s to add Signed-off-by line at the end of the commit message)\n (repeat as necessary)\n ------------------------------------------------\n \n-- \n1.4.4.gef06\n\n"},{"id":"295418","messageId":"20061120225220.GG12285@fieldses.org","threadId":"43210","inReplyTo":"4d8e3fd30611201430l6135814yc89f4abdb9044340@mail.gmail.com","subject":"Re: [PATCH] Documentation tutorial.txt: Teach the reader about git commit -a -s","fromName":"J. Bruce Fields","fromEmail":"bfields@fieldses.org","sentAt":"2006-11-20T22:52:20Z","receivedAt":"2006-11-20T22:52:20Z","isPatch":true,"sender":{"key":"bfields@citi.umich.edu","avatar":null},"body":"On Mon, Nov 20, 2006 at 11:30:56PM +0100, Paolo Ciarrocchi wrote:\n> I think it's important to mention, in the collaboration section,\n> that is possible to use the -s option to add the Signed-off-by\n> line\n> \n> Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>\n\nThe -s option is easy to learn later, and isn't really necessary for\nbasic project management; I'd rather leave it out of the first tutorial.\n\n(In fact, the best place for it may be in SubmittingPatches or\nequivalent for the particular project.)\n\n"},{"id":"297302","messageId":"7vd57hzpor.fsf@assigned-by-dhcp.cox.net","threadId":"43210","inReplyTo":"4d8e3fd30611201430l6135814yc89f4abdb9044340@mail.gmail.com","subject":"Re: [PATCH] Documentation tutorial.txt: Teach the reader about git commit -a -s","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-11-20T23:03:16Z","receivedAt":"2006-11-20T23:03:16Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Paolo Ciarrocchi\" <paolo.ciarrocchi@gmail.com> writes:\n\n> I think it's important to mention, in the collaboration section,\n> that is possible to use the -s option to add the Signed-off-by\n> line\n>\n> Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>\n\nS-O-B is a project convention that follows the patch acceptance\npolicy similar to the kernel, and I am a bit reluctant to tell\npeople to use -s before making it clear what the legal intent of\nthat line is.  And git tutorial is not the place to talk about\nthe patch acceptance policy of the git project.\n\nSo instead, my preference is to suggest people to use \"commit\n-s\" in \"Documentation/SubmittingPatches\" section.  That _is_\nabout the git project, and I think it helps the users that the\nsame rule/tip applies to the kernel by making it clear that the\nconvention and legal intent of S-O-B were borrowed from them.\n\nI am slightly disturbed by \n\n> ------------------------------------------------\n> (edit files)\n> +$ git commit -a (add -s to add Signed-off-by line at the end of the\n> commit message)\n> (repeat as necessary)\n> ------------------------------------------------\n\nthis formatting.  The examples that begin with '$' are meant to\nbe \"copy-me\" examples, and we do \"# comment\" elsewhere for\nexactly that reason.\n\nIf your MUA corrupts patches, then working it around by using\nattachment is tolerated, but please do try to see if you can\nmake your MUA behave first.  Attachments are hard to comment on\ninline.\n\nIf you need to do an attachment, please do not include the patch\ntwice.  That is a lot worse than having your patch only in the\nattachment.  I need to detach only the attachment part, compare\nit with what were discussed on the list based on the patch that\nwas in the non-attachment part of your message to make sure\nthere is no inconsistency between the two, and then apply the\none from the attachment separately.\n\nInstead, make the first \"text\" part of the multipart to contain\nthe proposed commit log message, and make sure that the rest of\nthe message (if multipart, then mailinfo will unwrap them for me\nand concatenate them together after the first '---' in the cover\ntext) does not have the same patch twice.\n\nYour message has the first text part in \"format=flawed\", which\nincluded a corrupted patch, and then the attachment contained a\nfull format-patch output.  As a result, taken as a whole the\nmessage includes the patch twice (once corrupted and then\nuncorrupted).  Please don't.\n"}]}