From patchwork Tue Mar 5 10:48:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Robert P. J. Day" X-Patchwork-Id: 10839257 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 80A471803 for ; Tue, 5 Mar 2019 10:48:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 63E832AAB7 for ; Tue, 5 Mar 2019 10:48:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 57EA52AB37; Tue, 5 Mar 2019 10:48:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C5CF92AAB7 for ; Tue, 5 Mar 2019 10:48:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726946AbfCEKsd (ORCPT ); Tue, 5 Mar 2019 05:48:33 -0500 Received: from cpanel4.indieserve.net ([199.212.143.9]:42612 "EHLO cpanel4.indieserve.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726179AbfCEKsd (ORCPT ); Tue, 5 Mar 2019 05:48:33 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=crashcourse.ca; s=default; h=Content-Type:MIME-Version:Message-ID:Subject: To:From:Date:Sender:Reply-To:Cc:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=y5fPQ0Op0K8yJBOi4dkGYPkajCsnZ+Qhk5Zp0pJOAXw=; b=JioDIH1oVzoEwiTWsree2ckL6r q0wLKw1FIYv6RhZI745HRKU9oDY1gzoqJVXhRfF0OTk6+h3U8cRbYlcmU0piF30QQvSwEZq+Q5B7o um8xag/eoWvA/4cxUtCAPQYWCK1vo/KKw/yLTDnTVHfWd06z/fBeQeBlixfIAk1jbdMUdDT+kUEyT cM33V03MPPQwFp3s/5qoFvpQOuMYraMNCep1m3uaVGFEHW1/i0a4wDhtLvP0aG5ehXUvFMUJktosY b783ACp4IYXJMlJtED9L5u0kzmle7ZzGyyPZ+AHxTpiYzMEnHFBnj6kl75s9IL85SM9O8oJ3Z77HA tdLRWMKQ==; Received: from cpef81d0f814063-cmf81d0f814060.cpe.net.cable.rogers.com ([174.114.57.56]:53606 helo=localhost.localdomain) by cpanel4.indieserve.net with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1h17cb-00GXUr-Oo for git@vger.kernel.org; Tue, 05 Mar 2019 05:48:30 -0500 Date: Tue, 5 Mar 2019 05:48:28 -0500 (EST) From: "Robert P. J. Day" X-X-Sender: rpjday@localhost.localdomain To: Git Mailing list Subject: [PATCH] doc/rebase: extend examples to show continuing branches Message-ID: User-Agent: Alpine 2.21 (LFD 202 2017-01-01) MIME-Version: 1.0 X-OutGoing-Spam-Status: No, score=-0.2 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - cpanel4.indieserve.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - crashcourse.ca X-Get-Message-Sender-Via: cpanel4.indieserve.net: authenticated_id: rpjday+crashcourse.ca/only user confirmed/virtual account not confirmed X-Authenticated-Sender: cpanel4.indieserve.net: rpjday@crashcourse.ca X-Source: X-Source-Args: X-Source-Dir: Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 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