{"thread":{"id":"25267","subject":"[PATCH] user-manual: be consistent in illustrations to 'git rebase'","startedAt":"2010-09-28T08:20:24Z","lastAt":"2010-09-28T11:08:39Z","messageCount":3,"participants":["Kirill Smelkov","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"151884","messageId":"1285662024-4992-1-git-send-email-kirr@mns.spb.ru","threadId":"25267","inReplyTo":null,"subject":"[PATCH] user-manual: be consistent in illustrations to 'git rebase'","fromName":"Kirill Smelkov","fromEmail":"kirr@mns.spb.ru","sentAt":"2010-09-28T08:20:24Z","receivedAt":"2010-09-28T08:20:24Z","isPatch":true,"sender":{"key":"kirr@navytux.spb.ru","avatar":"https://gravatar.com/avatar/cf3445fdad1849941e17ab25bf1ee7c5ea1be2deb444be25ff5f36b0e50a985f?d=mp&s=160"},"body":"Since we use a-b-c for mywork commits in one place, I think it would be\nlogical to also use a-b-c too in other illustration on this topic.\n\nSigned-off-by: Kirill Smelkov <kirr@mns.spb.ru>\n---\n Documentation/user-manual.txt |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt\nindex fecc4eb..87ca1a7 100644\n--- a/Documentation/user-manual.txt\n+++ b/Documentation/user-manual.txt\n@@ -2424,41 +2424,41 @@ Keeping a patch series up to date using git rebase\n --------------------------------------------------\n \n Suppose that you create a branch \"mywork\" on a remote-tracking branch\n \"origin\", and create some commits on top of it:\n \n -------------------------------------------------\n $ git checkout -b mywork origin\n $ vi file.txt\n $ git commit\n $ vi otherfile.txt\n $ git commit\n ...\n -------------------------------------------------\n \n You have performed no merges into mywork, so it is just a simple linear\n sequence of patches on top of \"origin\":\n \n ................................................\n  o--o--o <-- origin\n         \\\n-         o--o--o <-- mywork\n+         a--b--c <-- mywork\n ................................................\n \n Some more interesting work has been done in the upstream project, and\n \"origin\" has advanced:\n \n ................................................\n  o--o--O--o--o--o <-- origin\n         \\\n          a--b--c <-- mywork\n ................................................\n \n At this point, you could use \"pull\" to merge your changes back in;\n the result would create a new merge commit, like this:\n \n ................................................\n  o--o--O--o--o--o <-- origin\n         \\        \\\n          a--b--c--m <-- mywork\n ................................................\n \n-- \n1.7.3.6.g64005\n"},{"id":"151888","messageId":"7vy6amtd1a.fsf@alter.siamese.dyndns.org","threadId":"25267","inReplyTo":"1285662024-4992-1-git-send-email-kirr@mns.spb.ru","subject":"Re: [PATCH] user-manual: be consistent in illustrations to 'git rebase'","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-09-28T09:47:45Z","receivedAt":"2010-09-28T09:47:45Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Kirill Smelkov <kirr@mns.spb.ru> writes:\n\n> Since we use a-b-c for mywork commits in one place, I think it would be\n> logical to also use a-b-c too in other illustration on this topic.\n>\n> Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru>\n> ---\n>  Documentation/user-manual.txt |    2 +-\n>  1 files changed, 1 insertions(+), 1 deletions(-)\n>\n> diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt\n> index fecc4eb..87ca1a7 100644\n> --- a/Documentation/user-manual.txt\n> +++ b/Documentation/user-manual.txt\n> @@ -2424,41 +2424,41 @@ Keeping a patch series up to date using git rebase\n>  --------------------------------------------------\n>  \n>  Suppose that you create a branch \"mywork\" on a remote-tracking branch\n>  \"origin\", and create some commits on top of it:\n>  \n>  -------------------------------------------------\n>  $ git checkout -b mywork origin\n>  $ vi file.txt\n>  $ git commit\n>  $ vi otherfile.txt\n>  $ git commit\n>  ...\n>  -------------------------------------------------\n>  \n>  You have performed no merges into mywork, so it is just a simple linear\n>  sequence of patches on top of \"origin\":\n>  \n>  ................................................\n>   o--o--o <-- origin\n>          \\\n> -         o--o--o <-- mywork\n> +         a--b--c <-- mywork\n>  ................................................\n\nPerhaps you would want to make the origin commit \"O\" while you are at it\n(I can locally fix it up)?\n\n>  Some more interesting work has been done in the upstream project, and\n>  \"origin\" has advanced:\n>  \n>  ................................................\n>   o--o--O--o--o--o <-- origin\n>          \\\n>           a--b--c <-- mywork\n>  ................................................\n>  \n>  At this point, you could use \"pull\" to merge your changes back in;\n>  the result would create a new merge commit, like this:\n>  \n>  ................................................\n>   o--o--O--o--o--o <-- origin\n>          \\        \\\n>           a--b--c--m <-- mywork\n>  ................................................\n>  \n> -- \n> 1.7.3.6.g64005\n"},{"id":"151893","messageId":"20100928110839.GA5752@tugrik.mns.mnsspb.ru","threadId":"25267","inReplyTo":"7vy6amtd1a.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] user-manual: be consistent in illustrations to 'git rebase'","fromName":"Kirill Smelkov","fromEmail":"kirr@mns.spb.ru","sentAt":"2010-09-28T11:08:39Z","receivedAt":"2010-09-28T11:08:39Z","isPatch":true,"sender":{"key":"kirr@navytux.spb.ru","avatar":"https://gravatar.com/avatar/cf3445fdad1849941e17ab25bf1ee7c5ea1be2deb444be25ff5f36b0e50a985f?d=mp&s=160"},"body":"On Tue, Sep 28, 2010 at 02:47:45AM -0700, Junio C Hamano wrote:\n> Kirill Smelkov <kirr@mns.spb.ru> writes:\n> \n> > Since we use a-b-c for mywork commits in one place, I think it would be\n> > logical to also use a-b-c too in other illustration on this topic.\n> >\n> > Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru>\n> > ---\n> >  Documentation/user-manual.txt |    2 +-\n> >  1 files changed, 1 insertions(+), 1 deletions(-)\n> >\n> > diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt\n> > index fecc4eb..87ca1a7 100644\n> > --- a/Documentation/user-manual.txt\n> > +++ b/Documentation/user-manual.txt\n> > @@ -2424,41 +2424,41 @@ Keeping a patch series up to date using git rebase\n> >  --------------------------------------------------\n> >  \n> >  Suppose that you create a branch \"mywork\" on a remote-tracking branch\n> >  \"origin\", and create some commits on top of it:\n> >  \n> >  -------------------------------------------------\n> >  $ git checkout -b mywork origin\n> >  $ vi file.txt\n> >  $ git commit\n> >  $ vi otherfile.txt\n> >  $ git commit\n> >  ...\n> >  -------------------------------------------------\n> >  \n> >  You have performed no merges into mywork, so it is just a simple linear\n> >  sequence of patches on top of \"origin\":\n> >  \n> >  ................................................\n> >   o--o--o <-- origin\n> >          \\\n> > -         o--o--o <-- mywork\n> > +         a--b--c <-- mywork\n> >  ................................................\n> \n> Perhaps you would want to make the origin commit \"O\" while you are at it\n> (I can locally fix it up)?\n\nYes, please do, and thanks.\n"}]}