{"thread":{"id":"37070","subject":"Adding 'Signed-off-by' to 'subtree add --squash' commits","startedAt":"2014-07-07T09:32:47Z","lastAt":"2014-07-07T17:20:17Z","messageCount":3,"participants":["Finucane, Stephen","Andreas Schwab","Jeff King"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"245469","messageId":"6A74A01C3512C646A9ED99AFA28AEB981358A7E8@IRSMSX102.ger.corp.intel.com","threadId":"37070","inReplyTo":null,"subject":"Adding 'Signed-off-by' to 'subtree add --squash' commits","fromName":"Finucane, Stephen","fromEmail":"stephen.finucane@intel.com","sentAt":"2014-07-07T09:32:47Z","receivedAt":"2014-07-07T09:32:47Z","isPatch":false,"sender":{"key":"stephen.finucane@intel.com","avatar":null},"body":"Is it possible to \"sign off\" squashed commits created by the 'git subtree add ... --squash' command?\n\nI ask, because the Signed-off-by tag is a requirement for a project I work on, but I've been unable to achieve this. A thorough search of Google/StackOverflow reveals nothing.\n\nRegards,\n\nStephen Finucane\n\nPS: A visualisation. The issue is the second \"squash\" commit\n\n  |\\  Merge: 0000000 0000000\n  | | Author: Stephen Finucane <stephen.finucane@intel.com>\n  | | Date:   Mon Jul 7 10:21:51 2014 +0100\n  | |\n  | |     Add xxx as a git subtree\n  | |\n  | |     - There is no problem with this commit.\n  | |\n  | |     Signed-off-by: Stephen Finucane <stephen.finucane@intel.com>\n  | |\n  | * commit 0000000000000000000000000000000000000000\n  |   Author: Stephen Finucane <stephen.finucane@intel.com>\n  |   Date:   Mon Jul 7 10:21:51 2014 +0100\n  |\n  |       Squashed 'path/' content from commit 0000000\n  |\n  |       git-subtree-dir: path\n  |       git-subtree-split: 0000000000000000000000000000000000000000\n  |\n  * commit 0000000000000000000000000000000000000000\n  | Author: Stephen Finucane <stephen.finucane@intel.com>\n  | Date:   Mon Jul 7 10:04:38 2014 +0100\n  ...\n--------------------------------------------------------------\nIntel Shannon Limited\nRegistered in Ireland\nRegistered Office: Collinstown Industrial Park, Leixlip, County Kildare\nRegistered Number: 308263\nBusiness address: Dromore House, East Park, Shannon, Co. Clare\n\nThis e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.\n"},{"id":"245472","messageId":"87vbr93y8k.fsf@igel.home","threadId":"37070","inReplyTo":"6A74A01C3512C646A9ED99AFA28AEB981358A7E8@IRSMSX102.ger.corp.intel.com","subject":"Re: Adding 'Signed-off-by' to 'subtree add --squash' commits","fromName":"Andreas Schwab","fromEmail":"schwab@linux-m68k.org","sentAt":"2014-07-07T16:55:07Z","receivedAt":"2014-07-07T16:55:07Z","isPatch":false,"sender":{"key":"schwab@linux-m68k.org","avatar":"https://avatars.githubusercontent.com/u/2175493?v=4"},"body":"\"Finucane, Stephen\" <stephen.finucane@intel.com> writes:\n\n> Is it possible to \"sign off\" squashed commits created by the 'git subtree add ... --squash' command?\n\nIf it isn't directly possible, you can always use \"git commit --amend -C\nHEAD -s\" to modify the commit afterwards.\n\nAndreas.\n\n-- \nAndreas Schwab, schwab@linux-m68k.org\nGPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5\n\"And now for something completely different.\"\n"},{"id":"245478","messageId":"20140707172017.GA28405@sigill.intra.peff.net","threadId":"37070","inReplyTo":"87vbr93y8k.fsf@igel.home","subject":"Re: Adding 'Signed-off-by' to 'subtree add --squash' commits","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2014-07-07T17:20:17Z","receivedAt":"2014-07-07T17:20:17Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Mon, Jul 07, 2014 at 06:55:07PM +0200, Andreas Schwab wrote:\n\n> \"Finucane, Stephen\" <stephen.finucane@intel.com> writes:\n> \n> > Is it possible to \"sign off\" squashed commits created by the 'git subtree add ... --squash' command?\n> \n> If it isn't directly possible, you can always use \"git commit --amend -C\n> HEAD -s\" to modify the commit afterwards.\n\nI think that is sensible, though these days you can spell \"-C HEAD\" as\n\"--no-edit\", which I think is a bit more obvious.\n\n-Peff\n"}]}