From patchwork Sun Nov 10 09:59:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naveen Nathan X-Patchwork-Id: 11236179 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8BC191390 for ; Sun, 10 Nov 2019 10:01:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6938E207FA for ; Sun, 10 Nov 2019 10:01:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lastninja.net header.i=@lastninja.net header.b="OlIDQkhO"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="Vva+et7N" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726610AbfKJJ7s (ORCPT ); Sun, 10 Nov 2019 04:59:48 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:44301 "EHLO out5-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726054AbfKJJ7s (ORCPT ); Sun, 10 Nov 2019 04:59:48 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 5B9DB21AD2; Sun, 10 Nov 2019 04:59:47 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Sun, 10 Nov 2019 04:59:47 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lastninja.net; h=date:from:to:subject:message-id:mime-version:content-type; s= fm2; bh=AnRdkEz089FqULyp3Cm4DYFyaaaTVLK9Qgv+aoiX20k=; b=OlIDQkhO co4IXhQvjar4PlEy2wQg7Xo+HaWbEq8vPOVl276pVJt4T8xkji/mY7ER96rW/VnQ pZTGHO3a+YSJouTqts+kgO6NkhGpIkp+Sm8u6VXy6dgATIX3KlQNZ9zchQWaGLgs G7hrFdXCO7jTU1cu0rWLitixYSRR3BHVrrd5qt2L9iCojKyCvgkocmaA//E1XtKt pnnGKKiTYWGBJKR3oMhT5L2LOhzk74RkrorfxABrw3rZ+5MhlexT+/bCrbOm+SNE 3E/RjmU1BY7gdDucJiyIkYzgD8ICj9uXKq9rG58S/0sahGLqOsgz4bulQr7dh52D IzTLj63zN/vFEQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:message-id :mime-version:subject:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm1; bh=AnRdkEz089FqULyp3Cm4DYFyaaaTV LK9Qgv+aoiX20k=; b=Vva+et7N2ZmXR3N1RBnV8YUcwZLJU8HR6lsxDhqlTktD3 NNvxvzNDOQDNC8+k+H4JCuVIAtGF5HEiTlfvgkJeT5QW0T3qPb2RrXyH1leO2PAS fsCTOVcqSWcQ8QNLROBeodqdZ0f73o+BDmbdskX9tCaw8a1TXX/3AD7swOONDoY+ 3aqjGx8frdqItdwSzXh8aV8t9mwe56z7tSSM9nfMySnv5M0/Xo0l/cTGDgJonntO 837ma2Q+KX0xKlHslP9n9MOQuoSKyoOTFH42leiDWzSDWIPIFMc7nVdBwMZIUlO2 3Kp5IaL7MKf8KCoqy86TGXQij68GfL+EdD+Lmvjzg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedufedruddvhedgudduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpeffhffvuffkgggtuggfsehttdertd dtredvnecuhfhrohhmpefprghvvggvnhcupfgrthhhrghnuceonhgrvhgvvghnsehlrghs thhnihhnjhgrrdhnvghtqeenucfkphepuddruddvledrvddvuddrudekheenucfrrghrrg hmpehmrghilhhfrhhomhepnhgrvhgvvghnsehlrghsthhnihhnjhgrrdhnvghtnecuvehl uhhsthgvrhfuihiivgeptd X-ME-Proxy: Received: from a.local (unknown [1.129.221.185]) by mail.messagingengine.com (Postfix) with ESMTPA id 4EBF93060057 for ; Sun, 10 Nov 2019 04:59:46 -0500 (EST) Date: Sun, 10 Nov 2019 20:59:42 +1100 From: Naveen Nathan To: git@vger.kernel.org Subject: [PATCH] doc: improve readability of --rebase-merges in git-rebase Message-ID: <20191110095942.GB6071@a.local> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.12.1 (2019-06-15) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org When --rebase-merges was introduced in 427c3bd28a the sentence describing the difference between --rebase-merges and --preserve-merges is a little unclear and difficult to parse. This patch improves readability while retaining original meaning. Signed-off-by: Naveen Nathan --- Documentation/git-rebase.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 639a4179d1..6a826b47bd 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -442,9 +442,9 @@ i.e. commits that would be excluded by linkgit:git-log[1]'s the `rebase-cousins` mode is turned on, such commits are instead rebased onto `` (or ``, if specified). + -The `--rebase-merges` mode is similar in spirit to the deprecated -`--preserve-merges`, but in contrast to that option works well in interactive -rebases: commits can be reordered, inserted and dropped at will. +The `--rebase-merges` mode is similar in spirit to `--preserve-merges` +(deprecated) but actually works with interactive rebases, where commits +can be reordered, inserted and dropped at will. + It is currently only possible to recreate the merge commits using the `recursive` merge strategy; Different merge strategies can be used only via