git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Kirill Smelkov <kirr@mns.spb.ru>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Kirill Smelkov <kirr@mns.spb.ru>
Subject: [PATCH] user-manual: be consistent in illustrations to 'git rebase'
Date: Tue, 28 Sep 2010 12:20:24 +0400	[thread overview]
Message-ID: <1285662024-4992-1-git-send-email-kirr@mns.spb.ru> (raw)

Since we use a-b-c for mywork commits in one place, I think it would be
logical to also use a-b-c too in other illustration on this topic.

Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru>
---
 Documentation/user-manual.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index fecc4eb..87ca1a7 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -2424,41 +2424,41 @@ Keeping a patch series up to date using git rebase
 --------------------------------------------------
 
 Suppose that you create a branch "mywork" on a remote-tracking branch
 "origin", and create some commits on top of it:
 
 -------------------------------------------------
 $ git checkout -b mywork origin
 $ vi file.txt
 $ git commit
 $ vi otherfile.txt
 $ git commit
 ...
 -------------------------------------------------
 
 You have performed no merges into mywork, so it is just a simple linear
 sequence of patches on top of "origin":
 
 ................................................
  o--o--o <-- origin
         \
-         o--o--o <-- mywork
+         a--b--c <-- mywork
 ................................................
 
 Some more interesting work has been done in the upstream project, and
 "origin" has advanced:
 
 ................................................
  o--o--O--o--o--o <-- origin
         \
          a--b--c <-- mywork
 ................................................
 
 At this point, you could use "pull" to merge your changes back in;
 the result would create a new merge commit, like this:
 
 ................................................
  o--o--O--o--o--o <-- origin
         \        \
          a--b--c--m <-- mywork
 ................................................
 
-- 
1.7.3.6.g64005

             reply	other threads:[~2010-09-28  8:36 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-09-28  8:20 Kirill Smelkov [this message]
2010-09-28  9:47 ` [PATCH] user-manual: be consistent in illustrations to 'git rebase' Junio C Hamano
2010-09-28 11:08   ` Kirill Smelkov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1285662024-4992-1-git-send-email-kirr@mns.spb.ru \
    --to=kirr@mns.spb.ru \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).