{"thread":{"id":"1998","subject":"[PATCH Cogito] Fix README asciidoc formatting","startedAt":"2005-10-02T10:56:01Z","lastAt":"2005-10-21T01:18:21Z","messageCount":4,"participants":["Jonas Fonseca","Petr Baudis"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"9607","messageId":"20051002105601.GB9934@diku.dk","threadId":"1998","inReplyTo":null,"subject":"[PATCH Cogito] Fix README asciidoc formatting","fromName":"Jonas Fonseca","fromEmail":"fonseca@diku.dk","sentAt":"2005-10-02T10:56:01Z","receivedAt":"2005-10-02T10:56:01Z","isPatch":true,"sender":{"key":"fonseca@diku.dk","avatar":"https://gravatar.com/avatar/f82f3ad698717c51873b020c750a92438c820a24056dc39fe4d07baa10a92264?d=mp&s=160"},"body":"Add empty lines after code blocks to switch back to normal text.\n\nSigned-off-by: Jonas Fonseca \n\n---\n\nBTW, what about adding some notatation info for those boxes? It looks\nvery creative for an introduction document.\n\ncommit ca52918a9a6e02e55d878d8f5e68672432940337\ntree 60d270e8b45beeee9361b13284ff2eefec746fd6\nparent 9356837de630644323c800e2accad2618d7393f9\nauthor Jonas Fonseca Sun, 02 Oct 2005 12:45:03 +0200\ncommitter Jonas Fonseca Sun, 02 Oct 2005 12:45:03 +0200\n\n README | 5 +++++\n 1 files changed, 5 insertions(+), 0 deletions(-)\n\ndiff --git a/README b/README\n--- a/README\n+++ b/README\n@@ -305,11 +305,13 @@ will `cg-clone` do?\n \n \t+--------+\n \t+--------+\n+\n First it creates an empty repository\n \n \t+--------+\n \t$ origin<\n \t+--------+\n+\n Then it creates an 'origin' head, and will copy all the history from the\n remote repository's 'master' head there. So this head exists to reflect\n the state of the remote repository. The important point is that it is\n@@ -325,6 +327,7 @@ head and possibly push to it.\n \t| master<\n \t$ origin<\n \t+--------+\n+\n Finally it copied over the 'origin' head to the 'master' head, which will\n from now as your current head represent your local development in the\n repository.\n@@ -337,6 +340,7 @@ will it do?\n \t| master<\n \t$ origin< < < < <\n \t+--------+\n+\n First, it will populate your 'origin' head with the new commits from the\n remote's 'master' head.\n \n@@ -344,6 +348,7 @@ remote's 'master' head.\n \t| master<-M-.\n \t$ origin>---'\n \t+--------+\n+\n Then, it will merge those new commits to your 'master' head.\n \n Now let's imagine that there is also another head 'unoji' on the other side\n\n-- \nJonas Fonseca\n"},{"id":"9981","messageId":"20051011214318.GY22079@pasky.or.cz","threadId":"1998","inReplyTo":"20051002105601.GB9934@diku.dk","subject":"Re: [PATCH Cogito] Fix README asciidoc formatting","fromName":"Petr Baudis","fromEmail":"pasky@suse.cz","sentAt":"2005-10-11T21:43:18Z","receivedAt":"2005-10-11T21:43:18Z","isPatch":true,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"Dear diary, on Sun, Oct 02, 2005 at 12:56:01PM CEST, I got a letter\nwhere Jonas Fonseca told me that...\n> BTW, what about adding some notatation info for those boxes? It looks\n> very creative for an introduction document.\n\nWhat do you mean by \"notation info\"?\n\n> commit ca52918a9a6e02e55d878d8f5e68672432940337\n> tree 60d270e8b45beeee9361b13284ff2eefec746fd6\n> parent 9356837de630644323c800e2accad2618d7393f9\n> author Jonas Fonseca Sun, 02 Oct 2005 12:45:03 +0200\n> committer Jonas Fonseca Sun, 02 Oct 2005 12:45:03 +0200\n> \n> README | 5 +++++\n> 1 files changed, 5 insertions(+), 0 deletions(-)\n> \n> diff --git a/README b/README\n> --- a/README\n> +++ b/README\n> @@ -305,11 +305,13 @@ will `cg-clone` do?\n> \n> \t+--------+\n> \t+--------+\n> +\n> First it creates an empty repository\n> \n> \t+--------+\n> \t$ origin<\n> \t+--------+\n> +\n> Then it creates an 'origin' head, and will copy all the history from the\n> remote repository's 'master' head there. So this head exists to reflect\n> the state of the remote repository. The important point is that it is\n..snip..\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nStuff: http://pasky.or.cz/\nVI has two modes: the one in which it beeps and the one in which\nit doesn't.\n"},{"id":"10019","messageId":"20051012142223.GA29333@diku.dk","threadId":"1998","inReplyTo":"20051011214318.GY22079@pasky.or.cz","subject":"Re: [PATCH Cogito] Fix README asciidoc formatting","fromName":"Jonas Fonseca","fromEmail":"fonseca@diku.dk","sentAt":"2005-10-12T14:22:23Z","receivedAt":"2005-10-12T14:22:23Z","isPatch":true,"sender":{"key":"fonseca@diku.dk","avatar":"https://gravatar.com/avatar/f82f3ad698717c51873b020c750a92438c820a24056dc39fe4d07baa10a92264?d=mp&s=160"},"body":"Petr Baudis wrote Tue, Oct 11, 2005:\n> Dear diary, on Sun, Oct 02, 2005 at 12:56:01PM CEST, I got a letter\n> where Jonas Fonseca told me that...\n> > BTW, what about adding some notatation info for those boxes? It looks\n> > very creative for an introduction document.\n> \n> What do you mean by \"notation info\"?\n\nI mean some kind of explanatory caption accompanying the ASCII\nillustrations. At least I lack an explanation of what you mean\nby '<' in\n\n\t+--------+\n\t$ branch <\n\t+--------+\n\nIf you could please \"massage that gently into my frontal cortex\" I would\nbe very happy.\n\nAlso you use '<-M-' for merging? Why not use '<-U- for updating instead\nof '< < < <'.\n\n-- \nJonas Fonseca\n"},{"id":"10395","messageId":"20051021011821.GD30889@pasky.or.cz","threadId":"1998","inReplyTo":"20051012142223.GA29333@diku.dk","subject":"Re: [PATCH Cogito] Fix README asciidoc formatting","fromName":"Petr Baudis","fromEmail":"pasky@suse.cz","sentAt":"2005-10-21T01:18:21Z","receivedAt":"2005-10-21T01:18:21Z","isPatch":true,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"Dear diary, on Wed, Oct 12, 2005 at 04:22:23PM CEST, I got a letter\nwhere Jonas Fonseca told me that...\n> Petr Baudis wrote Tue, Oct 11, 2005:\n> > Dear diary, on Sun, Oct 02, 2005 at 12:56:01PM CEST, I got a letter\n> > where Jonas Fonseca told me that...\n> > > BTW, what about adding some notatation info for those boxes? It looks\n> > > very creative for an introduction document.\n> > \n> > What do you mean by \"notation info\"?\n> \n> I mean some kind of explanatory caption accompanying the ASCII\n> illustrations. At least I lack an explanation of what you mean\n> by '<' in\n> \n> \t+--------+\n> \t$ branch <\n> \t+--------+\n> \n> If you could please \"massage that gently into my frontal cortex\" I would\n> be very happy.\n\n'<' denotes the head, it might be possible to deduce from\n\n\t\t+--------+\n\t\t| master<\n\t\t$ origin<\n\t\t$ r-unoji<\n\t\t$upmirror|\n\t\t+--------+\n\n\tNote that 'upmirror' has no head associated, it has just the\n\t\"remote branch\" ...\n\nbut I added explicit explanation.\n\n> Also you use '<-M-' for merging? Why not use '<-U- for updating instead\n> of '< < < <'.\n\nGood point, changed that to <-F- (it's a fetch).\n\nThanks,\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nStuff: http://pasky.or.cz/\nVI has two modes: the one in which it beeps and the one in which\nit doesn't.\n"}]}