From patchwork Tue May 28 12:42:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin via GitGitGadget X-Patchwork-Id: 10964841 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 CAF7416C1 for ; Tue, 28 May 2019 12:42:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BB03828775 for ; Tue, 28 May 2019 12:42:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AF65B287A2; Tue, 28 May 2019 12:42:21 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 C59F328775 for ; Tue, 28 May 2019 12:42:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727409AbfE1MmS (ORCPT ); Tue, 28 May 2019 08:42:18 -0400 Received: from mail-ed1-f65.google.com ([209.85.208.65]:33282 "EHLO mail-ed1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726973AbfE1MmR (ORCPT ); Tue, 28 May 2019 08:42:17 -0400 Received: by mail-ed1-f65.google.com with SMTP id n17so31625428edb.0 for ; Tue, 28 May 2019 05:42:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=2fTOT+18DfhivdqRIEQtOSeld/hS+Yo80nD4JjOINXw=; b=Orno/YQXjdPWPVeAAiZGHZgiG5qzdw9edEHzwO8gGCtLXyH7nrWf3ThdP0f6gnFrB8 feq7wkFMz4wpPo8iNmRieUq7GHG398Xqj31Jzj7BFbsQHsNTCLXAvUsx25l/gqPAeK0o sc/kKTOwpTo9T0KvUJUAsaPnMIH53jwu5MKVIADTkH/vBVTJlywNBmknPmHY/7JLGsXY jx2vg9zNvB9zSuUUd1o7n4MWuRLkozi4R7/82OA5qPVn0eXxiT77FES6V7OGw6a2IcZj TeCudGWPhu257abpzDtcNrmds5G5wYER011wxo8goABTUQ3L/2HQlkDxl/BS6A0Rgvnq HuLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=2fTOT+18DfhivdqRIEQtOSeld/hS+Yo80nD4JjOINXw=; b=ITPJUQIWj08Crw3HOl/KpqnKxLONXup7i94zfipNhD3zBYPeEo+t/39pUA/NfXK9eS 201Sb5FKJYWlbKPSk7rO7u9F15RAcg+2IJporxsGj8vncl3Q/CHw9SE5EivQZ3Lz9p9s mJ8sg/N84zEcYD0UJXzeJ7DW9HLHYr3RiclEyghqkz2mtsEjz31qT4Iai2R4h/lm1Cfq eO58EFhCDUMa8PEsNtTppBUDB+Q2IcxEF5zTnkfaJdsLPAkQI3TfbFOoQlerCm+u66MU v8MPqveqGFaul7LSvM8gnRO92OZa2iF20VZFhm9PfZR3B1DBj2HuTNBIfui9AbtGN2ny t+6g== X-Gm-Message-State: APjAAAXF8TvOCy01VOOkiXBiMddlzUDkM7wOSlQM7RkrOAxAUjFYie+i yIBF4W+PDhr6aWQrdJkwmjSQ/gPBHh4= X-Google-Smtp-Source: APXvYqw+l7NnKlUTIGE21sYKkK/gF7tM0eXD0OB1wbxu760un39T/ChNxC40YoXwwdfL29GUtmvXyw== X-Received: by 2002:a50:b557:: with SMTP id z23mr128440870edd.154.1559047335344; Tue, 28 May 2019 05:42:15 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id x40sm4225584edx.52.2019.05.28.05.42.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 May 2019 05:42:14 -0700 (PDT) Date: Tue, 28 May 2019 05:42:14 -0700 (PDT) X-Google-Original-Date: Tue, 28 May 2019 12:42:11 GMT Message-Id: In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH 1/3] tests: mark a couple more test cases as requiring `rebase -p` Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Johannes Schindelin Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Johannes Schindelin The `--preserve-merges` option has been deprecated, and as a consequence we started to mark test cases that require that option to be supported, in preparation for removing that support eventually. Since we marked those test cases, a couple more crept into the test suite, and with this patch, we mark them, too. Signed-off-by: Johannes Schindelin --- t/t3422-rebase-incompatible-options.sh | 5 +++-- t/t3427-rebase-subtree.sh | 15 ++++++++++----- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/t/t3422-rebase-incompatible-options.sh b/t/t3422-rebase-incompatible-options.sh index bb78a6ec86..a5868ea152 100755 --- a/t/t3422-rebase-incompatible-options.sh +++ b/t/t3422-rebase-incompatible-options.sh @@ -65,12 +65,13 @@ test_rebase_am_only --ignore-whitespace test_rebase_am_only --committer-date-is-author-date test_rebase_am_only -C4 -test_expect_success '--preserve-merges incompatible with --signoff' ' +test_expect_success REBASE_P '--preserve-merges incompatible with --signoff' ' git checkout B^0 && test_must_fail git rebase --preserve-merges --signoff A ' -test_expect_success '--preserve-merges incompatible with --rebase-merges' ' +test_expect_success REBASE_P \ + '--preserve-merges incompatible with --rebase-merges' ' git checkout B^0 && test_must_fail git rebase --preserve-merges --rebase-merges A ' diff --git a/t/t3427-rebase-subtree.sh b/t/t3427-rebase-subtree.sh index 3780877e4e..d8640522a0 100755 --- a/t/t3427-rebase-subtree.sh +++ b/t/t3427-rebase-subtree.sh @@ -38,7 +38,8 @@ test_expect_success 'setup' ' ' # FAILURE: Does not preserve master4. -test_expect_failure 'Rebase -Xsubtree --preserve-merges --onto commit 4' ' +test_expect_failure REBASE_P \ + 'Rebase -Xsubtree --preserve-merges --onto commit 4' ' reset_rebase && git checkout -b rebase-preserve-merges-4 master && git filter-branch --prune-empty -f --subdirectory-filter files_subtree && @@ -48,7 +49,8 @@ test_expect_failure 'Rebase -Xsubtree --preserve-merges --onto commit 4' ' ' # FAILURE: Does not preserve master5. -test_expect_failure 'Rebase -Xsubtree --preserve-merges --onto commit 5' ' +test_expect_failure REBASE_P \ + 'Rebase -Xsubtree --preserve-merges --onto commit 5' ' reset_rebase && git checkout -b rebase-preserve-merges-5 master && git filter-branch --prune-empty -f --subdirectory-filter files_subtree && @@ -58,7 +60,8 @@ test_expect_failure 'Rebase -Xsubtree --preserve-merges --onto commit 5' ' ' # FAILURE: Does not preserve master4. -test_expect_failure 'Rebase -Xsubtree --keep-empty --preserve-merges --onto commit 4' ' +test_expect_failure REBASE_P \ + 'Rebase -Xsubtree --keep-empty --preserve-merges --onto commit 4' ' reset_rebase && git checkout -b rebase-keep-empty-4 master && git filter-branch --prune-empty -f --subdirectory-filter files_subtree && @@ -68,7 +71,8 @@ test_expect_failure 'Rebase -Xsubtree --keep-empty --preserve-merges --onto comm ' # FAILURE: Does not preserve master5. -test_expect_failure 'Rebase -Xsubtree --keep-empty --preserve-merges --onto commit 5' ' +test_expect_failure REBASE_P \ + 'Rebase -Xsubtree --keep-empty --preserve-merges --onto commit 5' ' reset_rebase && git checkout -b rebase-keep-empty-5 master && git filter-branch --prune-empty -f --subdirectory-filter files_subtree && @@ -78,7 +82,8 @@ test_expect_failure 'Rebase -Xsubtree --keep-empty --preserve-merges --onto comm ' # FAILURE: Does not preserve Empty. -test_expect_failure 'Rebase -Xsubtree --keep-empty --preserve-merges --onto empty commit' ' +test_expect_failure REBASE_P \ + 'Rebase -Xsubtree --keep-empty --preserve-merges --onto empty commit' ' reset_rebase && git checkout -b rebase-keep-empty-empty master && git filter-branch --prune-empty -f --subdirectory-filter files_subtree && From patchwork Tue May 28 12:42:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin via GitGitGadget X-Patchwork-Id: 10964837 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 56100112C for ; Tue, 28 May 2019 12:42:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 46D7928776 for ; Tue, 28 May 2019 12:42:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3B05A287C9; Tue, 28 May 2019 12:42:20 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 E637928776 for ; Tue, 28 May 2019 12:42:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727415AbfE1MmT (ORCPT ); Tue, 28 May 2019 08:42:19 -0400 Received: from mail-ed1-f68.google.com ([209.85.208.68]:33286 "EHLO mail-ed1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726933AbfE1MmS (ORCPT ); Tue, 28 May 2019 08:42:18 -0400 Received: by mail-ed1-f68.google.com with SMTP id n17so31625483edb.0 for ; Tue, 28 May 2019 05:42:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=HMQgZHfq9JEs+fc8qhzqeYNjLDHwafxvbtinbB89+p8=; b=ZwkADRHUjtu/ptEf43tYVzJwl13lLkD3P5ExsJuIxHAYkkBU9plA5YVyhvy6z7HT1/ gtEThbiti3zJEmZSL285ZkDdJAhYzAMR/NkTSpzcsw7HYlwbL+Vza58hLBoydLugn1LJ PKe6O2RSVhktiieVpvb0wtSulDMu5RA0TSDQ2fSMWi6X/dpGy8hLjiMEKZyPPeSm56Qd rpllczhEa4Hrsr470cP/7/1jCXKwEaTn55DWUr6FCEKbHpt5S8WV7NwfRtzA616OOQ73 8/FLYyvmUFWjoxgurtylegEHm9WNNhz8SXWxU22vAK1yDdhugavKskYwDcbmmtJed8lM VE2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=HMQgZHfq9JEs+fc8qhzqeYNjLDHwafxvbtinbB89+p8=; b=irZOTpFewYCtIf6vsBLSmgG5WAevdISftDSqjDURNmEcFYXeYI5IyuPVwLd7CAquvx d1kDPIQfdGDe+RWBlpHr79ij1rDIZ2xTfZlvMzkQNCNOjojkWhMsoeArVPbJuQRpVl2t XynVyaKuhs5LDCPRKOOwias5AN85ez/ozhK1q98ucRPR5O2szsaExk362XgJ0c51sLIm N55dPjko0ddGHHPTioL+vlW8MLCOVrSI4DSNrPZ2I1Mhqp+rI6uBaIA38n1YxFTdgZci 7l33Qz13Gz/ugPjD6iYdq4Bb1k45YJS2PUIyDuhgPQVDpu3COqU9LVItA/Puu2AX7RRO x66g== X-Gm-Message-State: APjAAAWBVMYMRN29voJqQPa8cJaHWcYEsxeuiT8vHI3itv3b31q30nRR Gyl5S5GeFjk3/y8rOZozVGOGZ4G1ACQ= X-Google-Smtp-Source: APXvYqwk8mUdKPLoXREl7s1yGNZXWE+d8gDKq/cFev/Cu7nXh0uQxhW9RLhiPyDhYWs0sQrmIQPCkA== X-Received: by 2002:a17:906:d557:: with SMTP id gk23mr19706824ejb.285.1559047336075; Tue, 28 May 2019 05:42:16 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id e33sm4227515edd.53.2019.05.28.05.42.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 May 2019 05:42:15 -0700 (PDT) Date: Tue, 28 May 2019 05:42:15 -0700 (PDT) X-Google-Original-Date: Tue, 28 May 2019 12:42:12 GMT Message-Id: <09cdff86fb42ee0dbc6ce6a1e276a17811a72021.1559047333.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH 2/3] docs: say that `--rebase=preserve` is deprecated Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Johannes Schindelin Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Johannes Schindelin As of Git v2.22.0, the `--preserve-merges` backend of `git rebase` will be officially deprecated in favor of the `--rebase-merges` backend. Consequently, `git pull --rebase=preserve` will also be deprected. State this explicitly. Signed-off-by: Johannes Schindelin --- Documentation/git-pull.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 118d9d86f7..a5e9501a0a 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -112,8 +112,9 @@ When set to `merges`, rebase using `git rebase --rebase-merges` so that the local merge commits are included in the rebase (see linkgit:git-rebase[1] for details). + -When set to preserve, rebase with the `--preserve-merges` option passed -to `git rebase` so that locally created merge commits will not be flattened. +When set to `preserve` (deprecated in favor of `merges`), rebase with the +`--preserve-merges` option passed to `git rebase` so that locally created +merge commits will not be flattened. + When false, merge the current branch into the upstream branch. + From patchwork Tue May 28 12:42:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin via GitGitGadget X-Patchwork-Id: 10964839 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 924CA92A for ; Tue, 28 May 2019 12:42:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7FAAA28776 for ; Tue, 28 May 2019 12:42:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 72159287C9; Tue, 28 May 2019 12:42:21 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 1937D28776 for ; Tue, 28 May 2019 12:42:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727430AbfE1MmU (ORCPT ); Tue, 28 May 2019 08:42:20 -0400 Received: from mail-ed1-f67.google.com ([209.85.208.67]:45452 "EHLO mail-ed1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727390AbfE1MmS (ORCPT ); Tue, 28 May 2019 08:42:18 -0400 Received: by mail-ed1-f67.google.com with SMTP id g57so16728989edc.12 for ; Tue, 28 May 2019 05:42:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=N3Cp8i9JwEcJxG1B2UlqEvv+bqTEEpNWRZZ63pk+CpQ=; b=NEv+BptzK3QPzJB4saHLojfNlZ+o0AK6PFTQKri+7OAhkW7z/FvNi3h0d2Ufd+Sc48 wA/LRIw2Xig3tIryRnOYBwx6S4bDPsb0weUWzC/zCTLIwe5HBJfMohCvqrV1guph8lSP tWo1vu9Ou+yTdisF645uGPScDtSqj79VOYaUnml8Lm39WIFAMunJ0jf6VbmTvbzV566T gNLPySz5n8lafdoFGxpyBRvmzA6/H6QB4wLXEHypjBi3Ki42U2mWcqJ/85/q98Yy40mQ nfLlRhM3aaR8+n/9RsArszCwt2xNxGxef/W2R0ax6ifTMTvyUknVkSVfb6SRdSRAHeFj 6nIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=N3Cp8i9JwEcJxG1B2UlqEvv+bqTEEpNWRZZ63pk+CpQ=; b=PSGC4YdRHWRSATvoxi9IKUyeftFKA/TCtXw56lWzBtAQht0wSxD/tMrAuLLdA46RIf 4Y+ThAlRdmz0vNskV/HpjW0VWg64fs8hTmluhM7mLzqlk0qkZucMIyxMf0swyxwaS8K5 Ycj+oXoy5AzK0f+ZGMyk8phd7QDwHUVP6O+z3W+GWA2tqqEnPOZGA3kOi1QOmeI1HEO/ iUcTStbNUvScBsSIps0Q/8VcC2CWZY2ciDi7qp242H1Aiyduq+MjfcD8cSBs6TULLhTx D7sXAftPNmACxF+HGEq6Jl1jjeD04PdUhPbmItWn452cvARM/ohY+Rv5Pwiw5McFccLe odxw== X-Gm-Message-State: APjAAAVZObUHzI3N4RR3beZSvNUXTwVgvKZEI1fcYdS8F0QpxOGCnroH t3Ti6P2KUajJCV8gz4W+vaC7esJNWPc= X-Google-Smtp-Source: APXvYqztebDGElg2SutsH6P3Rm1y+FVHOaodBsZdZVJVHboAAfFVyAP6IgaYkTaZE21P9qoVfiEHsQ== X-Received: by 2002:a50:8ed8:: with SMTP id x24mr130719884edx.183.1559047336738; Tue, 28 May 2019 05:42:16 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id e10sm418513eja.78.2019.05.28.05.42.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 May 2019 05:42:16 -0700 (PDT) Date: Tue, 28 May 2019 05:42:16 -0700 (PDT) X-Google-Original-Date: Tue, 28 May 2019 12:42:13 GMT Message-Id: <363da05a66360d2b5f31391878f08dcf81b04915.1559047333.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH 3/3] rebase docs: recommend `-r` over `-p` Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Johannes Schindelin Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Johannes Schindelin The `--preserve-merges` option is now deprecated in favor of `--rebase-merges`; Let's stop recommending the former. Signed-off-by: Johannes Schindelin --- Documentation/git-rebase.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index f5e6ae3907..5e4e927647 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -675,7 +675,8 @@ $ git rebase -i HEAD~5 And move the first patch to the end of the list. -You might want to preserve merges, if you have a history like this: +You might want to recreate merge commits, e.g. if you have a history +like this: ------------------ X @@ -689,7 +690,7 @@ Suppose you want to rebase the side branch starting at "A" to "Q". Make sure that the current HEAD is "B", and call ----------------------------- -$ git rebase -i -p --onto Q O +$ git rebase -i -r --onto Q O ----------------------------- Reordering and editing commits usually creates untested intermediate