From patchwork Sat Dec 8 23:15:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kyle Meyer X-Patchwork-Id: 10719817 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 3359815A6 for ; Sat, 8 Dec 2018 23:15:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 25C632AB73 for ; Sat, 8 Dec 2018 23:15:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1A29F2AB96; Sat, 8 Dec 2018 23:15:58 +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.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,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 357FD2AB73 for ; Sat, 8 Dec 2018 23:15:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726218AbeLHXPy (ORCPT ); Sat, 8 Dec 2018 18:15:54 -0500 Received: from pb-smtp2.pobox.com ([64.147.108.71]:63232 "EHLO pb-smtp2.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726199AbeLHXPx (ORCPT ); Sat, 8 Dec 2018 18:15:53 -0500 Received: from pb-smtp2.pobox.com (unknown [127.0.0.1]) by pb-smtp2.pobox.com (Postfix) with ESMTP id 899301121AB; Sat, 8 Dec 2018 18:15:51 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:date:message-id:mime-version:content-transfer-encoding; s=sasl; bh=2hmSjl1It9qYjK5pOpe4YiemAKk=; b=NtP3VhJWY6VGd/VsxxXk zQ5F12QoVQK0FTXxnVwHhRSSmenEujaFZhmfRTwQJslJFIyZGFBPyVf6sFb8q6Na 2OwZbhsCSM2me9Ez/B4e/nDI/m0GZhb0QqNxYGy258tudCzs/owGjVUrRr8QSPPm Hm8BF9ilP2wdsffJf87pIqo= Received: from pb-smtp2.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp2.pobox.com (Postfix) with ESMTP id 83CDE1121AA; Sat, 8 Dec 2018 18:15:51 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=kyleam.com; h=from:to:cc:subject:date:message-id:mime-version:content-transfer-encoding; s=mesmtp; bh=Ep1xZnNqLy2WOeoCB3xxa7gIlPpnxmoyocHr6keN2Nk=; b=suy5ZYaFHObEcdwCQh0s/8rQGkh3EneomIZsLfpYPzFmcG0MBL4aI9KPNt+gzEAfl5+i37GlNCuruceTGDIpRfZUGx5EKXG/wh6b+KuX8Cge3p7+9dcAkcXhOVTJ2YIsntXxqwImvsXtiosU7fKyOuztMQKA9FeRbQG+PTU6Ki4= Received: from hylob.local (unknown [76.118.43.98]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pb-smtp2.pobox.com (Postfix) with ESMTPSA id 098391121A7; Sat, 8 Dec 2018 18:15:51 -0500 (EST) From: Kyle Meyer To: git@vger.kernel.org Cc: Johannes.Schindelin@gmx.de, Kyle Meyer Subject: [PATCH] rebase docs: drop stray word in merge command description Date: Sat, 8 Dec 2018 18:15:41 -0500 Message-Id: <20181208231541.1341999-1-kyle@kyleam.com> X-Mailer: git-send-email 2.19.2 MIME-Version: 1.0 X-Pobox-Relay-ID: 3426D7EE-FB3F-11E8-BC30-BFB3E64BB12D-24757444!pb-smtp2.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Delete a misplaced word introduced by caafecfcf1 (rebase --rebase-merges: adjust man page for octopus support, 2018-03-09). Signed-off-by: Kyle Meyer --- Documentation/git-rebase.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index dff17b3178..2ee535fb23 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -979,7 +979,7 @@ when the merge operation did not even start), it is rescheduled immediately. At this time, the `merge` command will *always* use the `recursive` merge strategy for regular merges, and `octopus` for octopus merges, -strategy, with no way to choose a different one. To work around +with no way to choose a different one. To work around this, an `exec` command can be used to call `git merge` explicitly, using the fact that the labels are worktree-local refs (the ref `refs/rewritten/onto` would correspond to the label `onto`, for example).