{"thread":{"id":"8288","subject":"[PATCH] Documentation: fix git-config.xml generation","startedAt":"2007-05-23T22:16:12Z","lastAt":"2007-05-24T04:55:27Z","messageCount":6,"participants":["James Bowes","Jeffrey C. Ollie","Junio C Hamano","Shawn O. Pearce"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"43060","messageId":"3f80363f0705231516x7c6fa2daua33a708deaa7a10c@mail.gmail.com","threadId":"8288","inReplyTo":null,"subject":"[PATCH] Documentation: fix git-config.xml generation","fromName":"James Bowes","fromEmail":"jbowes@dangerouslyinc.com","sentAt":"2007-05-23T22:16:12Z","receivedAt":"2007-05-23T22:16:12Z","isPatch":true,"sender":{"key":"jbowes@dangerouslyinc.com","avatar":"https://gravatar.com/avatar/a2fe98c66b2b47a9fa9d2ba92ff949d54c3208b1f8acc2e745b4b84ae3c4483a?d=mp&s=160"},"body":"Signed-off-by: James Bowes \n---\n\nWith asciidoc 8.1.0 and xmlto 0.0.18, git-config.xml failed to\nvalidate. This patch just makes the asciidoc formatting for\nbranch.autosetupmerge the same as the other config options.\n\n Documentation/config.txt | 6 +++---\n 1 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex eb2e79a..14aa3bd 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -281,11 +281,11 @@ apply.whitespace::\n \tas the '--whitespace' option. See gitlink:git-apply[1].\n\n branch.autosetupmerge::\n-\tTells `git-branch' and `git-checkout' to setup new branches\n+\tTells `git-branch` and `git-checkout` to setup new branches\n \tso that gitlink:git-pull[1] will appropriately merge from that\n \tremote branch. Note that even if this option is not set,\n-\tthis behavior can be chosen per-branch using the `--track`\n-\tand `--no-track` options. This option defaults to false.\n+\tthis behavior can be chosen per-branch using the '--track'\n+\tand '--no-track' options. This option defaults to false.\n\n branch..remote::\n \tWhen in branch , it tells `git fetch` which remote to fetch.\n-- \n1.5.2.762.gd8c6\n"},{"id":"43091","messageId":"1179979802.3682.12.camel@lt21223.campus.dmacc.edu","threadId":"8288","inReplyTo":"3f80363f0705231516x7c6fa2daua33a708deaa7a10c@mail.gmail.com","subject":"Re: [PATCH] Documentation: fix git-config.xml generation","fromName":"Jeffrey C. Ollie","fromEmail":"jeff@ocjtech.us","sentAt":"2007-05-24T04:10:02Z","receivedAt":"2007-05-24T04:10:02Z","isPatch":true,"sender":{"key":"jeff@ocjtech.us","avatar":"https://gravatar.com/avatar/95918a1992f277a811c471ae7275f7e4c9d1a2e517ad290bd6aa93b97e8d34f3?d=mp&s=160"},"body":"On Wed, 2007-05-23 at 18:16 -0400, James Bowes wrote:\n>\n> With asciidoc 8.1.0 and xmlto 0.0.18, git-config.xml failed to\n> validate. This patch just makes the asciidoc formatting for\n> branch.autosetupmerge the same as the other config options.\n\nI can confirm that this patch fixes the validation errors...\n\nJeff\n\n"},{"id":"43092","messageId":"7vhcq2zw7y.fsf@assigned-by-dhcp.cox.net","threadId":"8288","inReplyTo":"1179979802.3682.12.camel@lt21223.campus.dmacc.edu","subject":"Re: [PATCH] Documentation: fix git-config.xml generation","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2007-05-24T04:22:57Z","receivedAt":"2007-05-24T04:22:57Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Jeffrey C. Ollie\" writes:\n\n> On Wed, 2007-05-23 at 18:16 -0400, James Bowes wrote:\n>>\n>> With asciidoc 8.1.0 and xmlto 0.0.18, git-config.xml failed to\n>> validate. This patch just makes the asciidoc formatting for\n>> branch.autosetupmerge the same as the other config options.\n>\n> I can confirm that this patch fixes the validation errors...\n\nYup, already pushed out about 7 hours ago.\n\nThanks.\n"},{"id":"43093","messageId":"1179981812.3682.16.camel@lt21223.campus.dmacc.edu","threadId":"8288","inReplyTo":"7vhcq2zw7y.fsf@assigned-by-dhcp.cox.net","subject":"Re: [PATCH] Documentation: fix git-config.xml generation","fromName":"Jeffrey C. Ollie","fromEmail":"jeff@ocjtech.us","sentAt":"2007-05-24T04:43:32Z","receivedAt":"2007-05-24T04:43:32Z","isPatch":true,"sender":{"key":"jeff@ocjtech.us","avatar":"https://gravatar.com/avatar/95918a1992f277a811c471ae7275f7e4c9d1a2e517ad290bd6aa93b97e8d34f3?d=mp&s=160"},"body":"On Wed, 2007-05-23 at 21:22 -0700, Junio C Hamano wrote:\n> \"Jeffrey C. Ollie\" writes:\n> \n> > On Wed, 2007-05-23 at 18:16 -0400, James Bowes wrote:\n> >>\n> >> With asciidoc 8.1.0 and xmlto 0.0.18, git-config.xml failed to\n> >> validate. This patch just makes the asciidoc formatting for\n> >> branch.autosetupmerge the same as the other config options.\n> >\n> > I can confirm that this patch fixes the validation errors...\n> \n> Yup, already pushed out about 7 hours ago.\n\nI do not see it in any of the public git repos. Is there some\nsynchronization interval I need to wait for?\n\nJeff\n\n"},{"id":"43094","messageId":"20070524044736.GH28023@spearce.org","threadId":"8288","inReplyTo":"1179981812.3682.16.camel@lt21223.campus.dmacc.edu","subject":"Re: [PATCH] Documentation: fix git-config.xml generation","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2007-05-24T04:47:36Z","receivedAt":"2007-05-24T04:47:36Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"\"Jeffrey C. Ollie\" wrote:\n> On Wed, 2007-05-23 at 21:22 -0700, Junio C Hamano wrote:\n> > \"Jeffrey C. Ollie\" writes:\n> > \n> > > On Wed, 2007-05-23 at 18:16 -0400, James Bowes wrote:\n> > >>\n> > >> With asciidoc 8.1.0 and xmlto 0.0.18, git-config.xml failed to\n> > >> validate. This patch just makes the asciidoc formatting for\n> > >> branch.autosetupmerge the same as the other config options.\n> > >\n> > > I can confirm that this patch fixes the validation errors...\n> > \n> > Yup, already pushed out about 7 hours ago.\n> \n> I do not see it in any of the public git repos. Is there some\n> synchronization interval I need to wait for?\n\nkernel.org has mirroring lags. When Junio pushes to kernel.org\nhe also pushes to repo.or.cz/alt-git.git. That's usually where\nI fetch from, as there's no mirroring lag at all.\n\nNote that repo.or.cz also has a git.git, which is a mirror of\nkernel.org's mirrors, so its uh, way way behind sometimes. ;-)\n\n-- \nShawn.\n"},{"id":"43096","messageId":"1179982527.3682.21.camel@lt21223.campus.dmacc.edu","threadId":"8288","inReplyTo":"20070524044736.GH28023@spearce.org","subject":"Re: [PATCH] Documentation: fix git-config.xml generation","fromName":"Jeffrey C. Ollie","fromEmail":"jeff@ocjtech.us","sentAt":"2007-05-24T04:55:27Z","receivedAt":"2007-05-24T04:55:27Z","isPatch":true,"sender":{"key":"jeff@ocjtech.us","avatar":"https://gravatar.com/avatar/95918a1992f277a811c471ae7275f7e4c9d1a2e517ad290bd6aa93b97e8d34f3?d=mp&s=160"},"body":"On Thu, 2007-05-24 at 00:47 -0400, Shawn O. Pearce wrote:\n> \n> kernel.org has mirroring lags. When Junio pushes to kernel.org\n> he also pushes to repo.or.cz/alt-git.git. That's usually where\n> I fetch from, as there's no mirroring lag at all.\n> \n> Note that repo.or.cz also has a git.git, which is a mirror of\n> kernel.org's mirrors, so its uh, way way behind sometimes. ;-)\n\nYes, I looked at all three, but didn't see it. It's not a big deal, as\nI've applied the patch locally.\n\nJeff\n"}]}