git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Robert P. J. Day" <rpjday@crashcourse.ca>
To: Git Mailing list <git@vger.kernel.org>
Subject: [PATCH] doc/rebase: extend examples to show continuing branches
Date: Tue, 5 Mar 2019 05:48:28 -0500 (EST)	[thread overview]
Message-ID: <alpine.LFD.2.21.1903050545460.24324@localhost.localdomain> (raw)


Currently, all of the examples for "man git-rebase" show rebasing from
a branch that has had no further development, which might mislead
readers into thinking that that is a necessary condition for rebasing,
so tweak the examples to show further development on such a branch to
clarify that.

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>

---

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 5629ba4c5d..ba3c44fdaf 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -109,8 +109,8 @@ functionality which is found in 'next'.
     o---o---o---o---o  master
          \
           o---o---o---o---o  next
-                           \
-                            o---o---o  topic
+                   \
+                    o---o---o  topic
 ------------

 We want to make 'topic' forked from branch 'master'; for example,
@@ -134,8 +134,8 @@ Another example of --onto option is to rebase part of a
 branch.  If we have the following situation:

 ------------
-                            H---I---J topicB
-                           /
+                        H---I---J topicB
+                       /
                   E---F---G  topicA
                  /
     A---B---C---D  master

-- 

========================================================================
Robert P. J. Day                                 Ottawa, Ontario, CANADA
                  http://crashcourse.ca/dokuwiki

Twitter:                                       http://twitter.com/rpjday
LinkedIn:                               http://ca.linkedin.com/in/rpjday
========================================================================

             reply	other threads:[~2019-03-05 10:48 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-05 10:48 Robert P. J. Day [this message]
2019-03-05 14:03 ` [PATCH] doc/rebase: extend examples to show continuing branches Junio C Hamano
2019-03-05 14:04   ` Robert P. J. Day

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=alpine.LFD.2.21.1903050545460.24324@localhost.localdomain \
    --to=rpjday@crashcourse.ca \
    --cc=git@vger.kernel.org \
    /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).