* [PATCH] Documentation: fix git-config.xml generation
@ 2007-05-23 22:16 James Bowes
2007-05-24 4:10 ` Jeffrey C. Ollie
0 siblings, 1 reply; 6+ messages in thread
From: James Bowes @ 2007-05-23 22:16 UTC (permalink / raw)
To: git, Junio C Hamano
Signed-off-by: James Bowes <jbowes@dangerouslyinc•com>
---
With asciidoc 8.1.0 and xmlto 0.0.18, git-config.xml failed to
validate. This patch just makes the asciidoc formatting for
branch.autosetupmerge the same as the other config options.
Documentation/config.txt | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index eb2e79a..14aa3bd 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -281,11 +281,11 @@ apply.whitespace::
as the '--whitespace' option. See gitlink:git-apply[1].
branch.autosetupmerge::
- Tells `git-branch' and `git-checkout' to setup new branches
+ Tells `git-branch` and `git-checkout` to setup new branches
so that gitlink:git-pull[1] will appropriately merge from that
remote branch. Note that even if this option is not set,
- this behavior can be chosen per-branch using the `--track`
- and `--no-track` options. This option defaults to false.
+ this behavior can be chosen per-branch using the '--track'
+ and '--no-track' options. This option defaults to false.
branch.<name>.remote::
When in branch <name>, it tells `git fetch` which remote to fetch.
--
1.5.2.762.gd8c6
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] Documentation: fix git-config.xml generation
2007-05-23 22:16 [PATCH] Documentation: fix git-config.xml generation James Bowes
@ 2007-05-24 4:10 ` Jeffrey C. Ollie
2007-05-24 4:22 ` Junio C Hamano
0 siblings, 1 reply; 6+ messages in thread
From: Jeffrey C. Ollie @ 2007-05-24 4:10 UTC (permalink / raw)
To: git
[-- Attachment #1: Type: text/plain, Size: 324 bytes --]
On Wed, 2007-05-23 at 18:16 -0400, James Bowes wrote:
>
> With asciidoc 8.1.0 and xmlto 0.0.18, git-config.xml failed to
> validate. This patch just makes the asciidoc formatting for
> branch.autosetupmerge the same as the other config options.
I can confirm that this patch fixes the validation errors...
Jeff
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Documentation: fix git-config.xml generation
2007-05-24 4:10 ` Jeffrey C. Ollie
@ 2007-05-24 4:22 ` Junio C Hamano
2007-05-24 4:43 ` Jeffrey C. Ollie
0 siblings, 1 reply; 6+ messages in thread
From: Junio C Hamano @ 2007-05-24 4:22 UTC (permalink / raw)
To: Jeffrey C. Ollie; +Cc: git
"Jeffrey C. Ollie" <jeff@ocjtech•us> writes:
> On Wed, 2007-05-23 at 18:16 -0400, James Bowes wrote:
>>
>> With asciidoc 8.1.0 and xmlto 0.0.18, git-config.xml failed to
>> validate. This patch just makes the asciidoc formatting for
>> branch.autosetupmerge the same as the other config options.
>
> I can confirm that this patch fixes the validation errors...
Yup, already pushed out about 7 hours ago.
Thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Documentation: fix git-config.xml generation
2007-05-24 4:22 ` Junio C Hamano
@ 2007-05-24 4:43 ` Jeffrey C. Ollie
2007-05-24 4:47 ` Shawn O. Pearce
0 siblings, 1 reply; 6+ messages in thread
From: Jeffrey C. Ollie @ 2007-05-24 4:43 UTC (permalink / raw)
To: git
[-- Attachment #1: Type: text/plain, Size: 619 bytes --]
On Wed, 2007-05-23 at 21:22 -0700, Junio C Hamano wrote:
> "Jeffrey C. Ollie" <jeff@ocjtech•us> writes:
>
> > On Wed, 2007-05-23 at 18:16 -0400, James Bowes wrote:
> >>
> >> With asciidoc 8.1.0 and xmlto 0.0.18, git-config.xml failed to
> >> validate. This patch just makes the asciidoc formatting for
> >> branch.autosetupmerge the same as the other config options.
> >
> > I can confirm that this patch fixes the validation errors...
>
> Yup, already pushed out about 7 hours ago.
I do not see it in any of the public git repos. Is there some
synchronization interval I need to wait for?
Jeff
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Documentation: fix git-config.xml generation
2007-05-24 4:43 ` Jeffrey C. Ollie
@ 2007-05-24 4:47 ` Shawn O. Pearce
2007-05-24 4:55 ` Jeffrey C. Ollie
0 siblings, 1 reply; 6+ messages in thread
From: Shawn O. Pearce @ 2007-05-24 4:47 UTC (permalink / raw)
To: Jeffrey C. Ollie; +Cc: git
"Jeffrey C. Ollie" <jeff@ocjtech•us> wrote:
> On Wed, 2007-05-23 at 21:22 -0700, Junio C Hamano wrote:
> > "Jeffrey C. Ollie" <jeff@ocjtech•us> writes:
> >
> > > On Wed, 2007-05-23 at 18:16 -0400, James Bowes wrote:
> > >>
> > >> With asciidoc 8.1.0 and xmlto 0.0.18, git-config.xml failed to
> > >> validate. This patch just makes the asciidoc formatting for
> > >> branch.autosetupmerge the same as the other config options.
> > >
> > > I can confirm that this patch fixes the validation errors...
> >
> > Yup, already pushed out about 7 hours ago.
>
> I do not see it in any of the public git repos. Is there some
> synchronization interval I need to wait for?
kernel.org has mirroring lags. When Junio pushes to kernel.org
he also pushes to repo.or.cz/alt-git.git. That's usually where
I fetch from, as there's no mirroring lag at all.
Note that repo.or.cz also has a git.git, which is a mirror of
kernel.org's mirrors, so its uh, way way behind sometimes. ;-)
--
Shawn.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Documentation: fix git-config.xml generation
2007-05-24 4:47 ` Shawn O. Pearce
@ 2007-05-24 4:55 ` Jeffrey C. Ollie
0 siblings, 0 replies; 6+ messages in thread
From: Jeffrey C. Ollie @ 2007-05-24 4:55 UTC (permalink / raw)
To: git
[-- Attachment #1: Type: text/plain, Size: 502 bytes --]
On Thu, 2007-05-24 at 00:47 -0400, Shawn O. Pearce wrote:
>
> kernel.org has mirroring lags. When Junio pushes to kernel.org
> he also pushes to repo.or.cz/alt-git.git. That's usually where
> I fetch from, as there's no mirroring lag at all.
>
> Note that repo.or.cz also has a git.git, which is a mirror of
> kernel.org's mirrors, so its uh, way way behind sometimes. ;-)
Yes, I looked at all three, but didn't see it. It's not a big deal, as
I've applied the patch locally.
Jeff
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2007-05-24 4:54 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-05-23 22:16 [PATCH] Documentation: fix git-config.xml generation James Bowes
2007-05-24 4:10 ` Jeffrey C. Ollie
2007-05-24 4:22 ` Junio C Hamano
2007-05-24 4:43 ` Jeffrey C. Ollie
2007-05-24 4:47 ` Shawn O. Pearce
2007-05-24 4:55 ` Jeffrey C. Ollie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox