git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH Cogito] Fix README asciidoc formatting
@ 2005-10-02 10:56 Jonas Fonseca
  2005-10-11 21:43 ` Petr Baudis
  0 siblings, 1 reply; 4+ messages in thread
From: Jonas Fonseca @ 2005-10-02 10:56 UTC (permalink / raw)
  To: Petr Baudis; +Cc: git

Add empty lines after code blocks to switch back to normal text.

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>

---

BTW, what about adding some notatation info for those boxes? It looks
very creative for an introduction document.

commit ca52918a9a6e02e55d878d8f5e68672432940337
tree 60d270e8b45beeee9361b13284ff2eefec746fd6
parent 9356837de630644323c800e2accad2618d7393f9
author Jonas Fonseca <fonseca@diku.dk> Sun, 02 Oct 2005 12:45:03 +0200
committer Jonas Fonseca <fonseca@antimatter.(none)> Sun, 02 Oct 2005 12:45:03 +0200

 README |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/README b/README
--- a/README
+++ b/README
@@ -305,11 +305,13 @@ will `cg-clone` do?
 
 	+--------+
 	+--------+
+
 First it creates an empty repository
 
 	+--------+
 	$  origin<
 	+--------+
+
 Then it creates an 'origin' head, and will copy all the history from the
 remote repository's 'master' head there. So this head exists to reflect
 the state of the remote repository. The important point is that it is
@@ -325,6 +327,7 @@ head and possibly push to it.
 	|  master<
 	$  origin<
 	+--------+
+
 Finally it copied over the 'origin' head to the 'master' head, which will
 from now as your current head represent your local development in the
 repository.
@@ -337,6 +340,7 @@ will it do?
 	|  master<
 	$  origin< < < < <
 	+--------+
+
 First, it will populate your 'origin' head with the new commits from the
 remote's 'master' head.
 
@@ -344,6 +348,7 @@ remote's 'master' head.
 	|  master<-M-.
 	$  origin>---'
 	+--------+
+
 Then, it will merge those new commits to your 'master' head.
 
 Now let's imagine that there is also another head 'unoji' on the other side

-- 
Jonas Fonseca

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH Cogito] Fix README asciidoc formatting
  2005-10-02 10:56 [PATCH Cogito] Fix README asciidoc formatting Jonas Fonseca
@ 2005-10-11 21:43 ` Petr Baudis
  2005-10-12 14:22   ` Jonas Fonseca
  0 siblings, 1 reply; 4+ messages in thread
From: Petr Baudis @ 2005-10-11 21:43 UTC (permalink / raw)
  To: Jonas Fonseca; +Cc: git

Dear diary, on Sun, Oct 02, 2005 at 12:56:01PM CEST, I got a letter
where Jonas Fonseca <fonseca@diku.dk> told me that...
> BTW, what about adding some notatation info for those boxes? It looks
> very creative for an introduction document.

What do you mean by "notation info"?

> commit ca52918a9a6e02e55d878d8f5e68672432940337
> tree 60d270e8b45beeee9361b13284ff2eefec746fd6
> parent 9356837de630644323c800e2accad2618d7393f9
> author Jonas Fonseca <fonseca@diku.dk> Sun, 02 Oct 2005 12:45:03 +0200
> committer Jonas Fonseca <fonseca@antimatter.(none)> Sun, 02 Oct 2005 12:45:03 +0200
> 
>  README |    5 +++++
>  1 files changed, 5 insertions(+), 0 deletions(-)
> 
> diff --git a/README b/README
> --- a/README
> +++ b/README
> @@ -305,11 +305,13 @@ will `cg-clone` do?
>  
>  	+--------+
>  	+--------+
> +
>  First it creates an empty repository
>  
>  	+--------+
>  	$  origin<
>  	+--------+
> +
>  Then it creates an 'origin' head, and will copy all the history from the
>  remote repository's 'master' head there. So this head exists to reflect
>  the state of the remote repository. The important point is that it is
..snip..

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
VI has two modes: the one in which it beeps and the one in which
it doesn't.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH Cogito] Fix README asciidoc formatting
  2005-10-11 21:43 ` Petr Baudis
@ 2005-10-12 14:22   ` Jonas Fonseca
  2005-10-21  1:18     ` Petr Baudis
  0 siblings, 1 reply; 4+ messages in thread
From: Jonas Fonseca @ 2005-10-12 14:22 UTC (permalink / raw)
  To: Petr Baudis; +Cc: git

Petr Baudis <pasky@suse.cz> wrote Tue, Oct 11, 2005:
> Dear diary, on Sun, Oct 02, 2005 at 12:56:01PM CEST, I got a letter
> where Jonas Fonseca <fonseca@diku.dk> told me that...
> > BTW, what about adding some notatation info for those boxes? It looks
> > very creative for an introduction document.
> 
> What do you mean by "notation info"?

I mean some kind of explanatory caption accompanying the ASCII
illustrations. At least I lack an explanation of what you mean
by '<' in

	+--------+
	$ branch <
	+--------+

If you could please "massage that gently into my frontal cortex" I would
be very happy.

Also you use '<-M-' for merging? Why not use '<-U- for updating instead
of '< < < <'.

-- 
Jonas Fonseca

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH Cogito] Fix README asciidoc formatting
  2005-10-12 14:22   ` Jonas Fonseca
@ 2005-10-21  1:18     ` Petr Baudis
  0 siblings, 0 replies; 4+ messages in thread
From: Petr Baudis @ 2005-10-21  1:18 UTC (permalink / raw)
  To: Jonas Fonseca; +Cc: git

Dear diary, on Wed, Oct 12, 2005 at 04:22:23PM CEST, I got a letter
where Jonas Fonseca <fonseca@diku.dk> told me that...
> Petr Baudis <pasky@suse.cz> wrote Tue, Oct 11, 2005:
> > Dear diary, on Sun, Oct 02, 2005 at 12:56:01PM CEST, I got a letter
> > where Jonas Fonseca <fonseca@diku.dk> told me that...
> > > BTW, what about adding some notatation info for those boxes? It looks
> > > very creative for an introduction document.
> > 
> > What do you mean by "notation info"?
> 
> I mean some kind of explanatory caption accompanying the ASCII
> illustrations. At least I lack an explanation of what you mean
> by '<' in
> 
> 	+--------+
> 	$ branch <
> 	+--------+
> 
> If you could please "massage that gently into my frontal cortex" I would
> be very happy.

'<' denotes the head, it might be possible to deduce from

		+--------+
		|  master<
		$  origin<
		$ r-unoji<
		$upmirror|
		+--------+

	Note that 'upmirror' has no head associated, it has just the
	"remote branch" ...

but I added explicit explanation.

> Also you use '<-M-' for merging? Why not use '<-U- for updating instead
> of '< < < <'.

Good point, changed that to <-F- (it's a fetch).

Thanks,

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
VI has two modes: the one in which it beeps and the one in which
it doesn't.

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2005-10-21  1:18 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2005-10-02 10:56 [PATCH Cogito] Fix README asciidoc formatting Jonas Fonseca
2005-10-11 21:43 ` Petr Baudis
2005-10-12 14:22   ` Jonas Fonseca
2005-10-21  1:18     ` Petr Baudis

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).