{"thread":{"id":"9656","subject":"Re: user-manual patches","startedAt":"2007-08-26T16:20:50Z","lastAt":"2007-08-26T21:26:27Z","messageCount":2,"participants":["J. Bruce Fields","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"51573","messageId":"20070826162050.GA28795@fieldses.org","threadId":"9656","inReplyTo":null,"subject":"Re: user-manual patches","fromName":"J. Bruce Fields","fromEmail":"bfields@fieldses.org","sentAt":"2007-08-26T16:20:50Z","receivedAt":"2007-08-26T16:20:50Z","isPatch":false,"sender":{"key":"bfields@citi.umich.edu","avatar":null},"body":"On Sun, Aug 26, 2007 at 12:16:56PM -0400, J. Bruce Fields wrote:\n> \n> The following changes are available from the \"maint\" branch at:\n> \n>   ssh://linux-nfs.org/~bfields/exports/git.git maint\n\nUm, sorry for the duplicates.  I'm clearly not competent to operation\ngit-send-email.\n\nAlso one chunk from David Kastrup's gitlink fixes only applied to\nmaster, so I applied the whole thing there, did a merge, and pushed the\nresult to my master branch.  If that was the right thing to do, then I\nguess you can just pull from both of\n\n\tgit://linux-nfs.org/~bfields/git\tmaint\n\tgit://linux-nfs.org/~bfields/git\tmaster\n\n?\n\n--b.\n"},{"id":"51607","messageId":"7vodgung1o.fsf@gitster.siamese.dyndns.org","threadId":"9656","inReplyTo":"20070826162050.GA28795@fieldses.org","subject":"Re: user-manual patches","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2007-08-26T21:26:27Z","receivedAt":"2007-08-26T21:26:27Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"J. Bruce Fields\" <bfields@fieldses.org> writes:\n\n> On Sun, Aug 26, 2007 at 12:16:56PM -0400, J. Bruce Fields wrote:\n>> \n>> The following changes are available from the \"maint\" branch at:\n>> \n>>   ssh://linux-nfs.org/~bfields/exports/git.git maint\n>\n> Um, sorry for the duplicates.  I'm clearly not competent to operation\n> git-send-email.\n>\n> Also one chunk from David Kastrup's gitlink fixes only applied to\n> master, so I applied the whole thing there, did a merge, and pushed the\n> result to my master branch.  If that was the right thing to do, then I\n> guess you can just pull from both of\n>\n> \tgit://linux-nfs.org/~bfields/git\tmaint\n> \tgit://linux-nfs.org/~bfields/git\tmaster\n>\n> ?\n\nThanks.  I'd imagined just I'd just merge your master and\neverything would be fine, as your maint would be an ancestor of\nyour maint.  And it indeed went fine ;-)\n"}]}