[PATCH] doc/rebase: extend examples to show continuing branches
From: Robert P. J. Day <hidden>
Date: 2019-03-05 10:48:34
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
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 <redacted> ---
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
========================================================================