From patchwork Wed Mar 13 18:27:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phillip Wood X-Patchwork-Id: 10851627 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 90D7B6C2 for ; Wed, 13 Mar 2019 18:28:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7BBB729F5B for ; Wed, 13 Mar 2019 18:28:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7002F29F61; Wed, 13 Mar 2019 18:28:09 +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 4F10729F5B for ; Wed, 13 Mar 2019 18:28:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726446AbfCMS2G (ORCPT ); Wed, 13 Mar 2019 14:28:06 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:54402 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726033AbfCMS2G (ORCPT ); Wed, 13 Mar 2019 14:28:06 -0400 Received: by mail-wm1-f68.google.com with SMTP id f3so300719wmj.4 for ; Wed, 13 Mar 2019 11:28:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:reply-to:mime-version :content-transfer-encoding; bh=yGz8xgUm1upLYrXRzPc4Egi4CooHjTNtDywq++chZfI=; b=R3dEMwy3XwDfP+5LAYTL1E68O5X3e82bQpxcpYFHb6YMpXC0YLwPDMRX9+6eLRD7s5 90DztsQCmjB0lZxFdt0240uEZ+xL9P/L2PCm0II1JVRI2L9p4tT6QZGq/Y0vzAJzJ/6C KRlEBqqxhgx5xEiItZhJ8WT5lrxo7ccdeJJgtBwu/hB5N+q2lp3fAh3JSiuBo9r2EuZN ORv6bC1cqZfDsU8DobTrNNYne0qM2tiSCfhJ3tR39IFzu62fJK6S5jhiO8QEuyCk2QD+ bBn013qYYg7DgnCVjNH0cLeUeo0UpyPQwO/tp8KhknIelBGWgcxvGB93j0sBDLt2X7p4 +pvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :mime-version:content-transfer-encoding; bh=yGz8xgUm1upLYrXRzPc4Egi4CooHjTNtDywq++chZfI=; b=DoTlkRTQVANS6wr0KBDOmby5Y4EsCccsOR15Y0ZDF5z6b7YT8cxnnXWw8QW2duo316 rtWqnMlNu0h+3IHu15IAc2DJaSfJA/ZOFoOO34w4KRiV+eSsCtGqjA+x9xuOQXzKLYwE xQZT1/N5h779Dj1ukmgInhp1xSxOqVCUrO7AEmMTAk4IMGGLVrqIdQhF9Kw6HJOPoxuq lhD5fc8RXGYmyYWJeAY0Ueapvmj29/Gp96C+95boFA5z6ZzSjp9p09q5vv6wJrPqf+q8 R2VS0PQgFikSS9NbpyvR3ld0w3pr9CUTblUdjIxabl3Vdi0SCqSJva8tJxYwRkDGyhRA ZmVA== X-Gm-Message-State: APjAAAVHloBjch0tWMXR9FcvhFdYfdhl7Oo6TEq+CEJZcfqkdiGEG7I/ LyztPZ3gXCZ/5G/o5zBLgqW17Sl0h8gs5g== X-Google-Smtp-Source: APXvYqw6HsEMCHxDEKOZFva3/RauAhQOyZogYkvHfkZlGQmnTkS7lbetQYNG4MZfnEBVvgZR8j6FnA== X-Received: by 2002:a1c:f707:: with SMTP id v7mr3228630wmh.109.1552501684382; Wed, 13 Mar 2019 11:28:04 -0700 (PDT) Received: from lindisfarne.localdomain (host-89-242-186-210.as13285.net. [89.242.186.210]) by smtp.gmail.com with ESMTPSA id b3sm2793929wmj.15.2019.03.13.11.28.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Mar 2019 11:28:03 -0700 (PDT) From: Phillip Wood To: Git Mailing List Cc: Junio C Hamano , Phillip Wood Subject: [PATCH 1/4] rebase: document --rerere-autoupdate Date: Wed, 13 Mar 2019 18:27:53 +0000 Message-Id: <20190313182756.8076-1-phillip.wood123@gmail.com> X-Mailer: git-send-email 2.21.0 Reply-To: Phillip Wood MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Phillip Wood This option was missing from the man page. Signed-off-by: Phillip Wood --- Documentation/git-rebase.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 5629ba4c5d..fbf9a4d70a 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -300,6 +300,11 @@ See also INCOMPATIBLE OPTIONS below. + See also INCOMPATIBLE OPTIONS below. +--rerere-autoupdate:: +--no-rerere-autoupdate:: + Allow the rerere mechanism to update the index with the + result of auto-conflict resolution if possible. + -S[]:: --gpg-sign[=]:: GPG-sign commits. The `keyid` argument is optional and From patchwork Wed Mar 13 18:27:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phillip Wood X-Patchwork-Id: 10851629 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 D15256C2 for ; Wed, 13 Mar 2019 18:28:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BA91429F5B for ; Wed, 13 Mar 2019 18:28:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AD62029F60; Wed, 13 Mar 2019 18:28:10 +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 5992A29F5B for ; Wed, 13 Mar 2019 18:28:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726749AbfCMS2J (ORCPT ); Wed, 13 Mar 2019 14:28:09 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:38359 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726420AbfCMS2H (ORCPT ); Wed, 13 Mar 2019 14:28:07 -0400 Received: by mail-wr1-f68.google.com with SMTP id g12so3115452wrm.5 for ; Wed, 13 Mar 2019 11:28:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=STD/M3JSOnWm4PTl3m7wULjwzIdQGJVvvThd46HF2qw=; b=hEBkV3JACtcRxy82WNUVo9e+4NQ+tp4h+bjv+zArN0lwh4y0jG4/WbIdumxPzJde82 hqkR1PWFlua76GRBEstV2zZzeddfPk8dfTLU2aCUbQsFo/wM4caoajqJand3fepabYSh oQTMhlpaesl8AXZ7725PWzzZee4DBN0ejm3BWWHvYyV5phFE2M9L50pKk8rMpnu06kQi 5TBn35IFMwWu4j0fTM8BqV0qJTAfW4jR7wP4aqT9ExSIG3TzqBvvUaw3KmcEphst3DR+ bZ4J/PR3QWKYH7rMpRjRvU2TJFMKVghlSV3orA10RehZRtXSHXteLD4yniny6YSxzb7O s7eQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=STD/M3JSOnWm4PTl3m7wULjwzIdQGJVvvThd46HF2qw=; b=ULOsTuSsh6AROztnZcILUjJ4yvcOf4xdMhavxA+e/yMki1dljIUbvh9N0mtwc0Cs1V R52FJzpwKTO21VyntbmC2WggEyXGGput/F8fPMhaut5FO717Xh8phQ/aGgBC025sCncO 6rWp3pkooJSGKhQqqzlYuIZUcv1+7nQQ+udDomYIZXwy5sR0p1IoG8FkS5G3KPgKvAuU m1AgNL/DwRJbc9Arb8uHAM7bZ98/FBGGofmrR6CCf+6pxrWnLzerl6Wq1Mid/XjO3cw6 koEjG/2T3XfZVXfQEg6JJT06qyRSS33I/Bu+LoX2d7hpgBTSUQqxPA1SGjBmFVGNMtCS hR4Q== X-Gm-Message-State: APjAAAXOpJmpBE5CamGtbxAtEA3xAtNxy4cxsC2JaDkiyQDW2CWYRjDh z8X9Uz9JOlgP0wQ0+S8H09YJdfFkQ8WDyA== X-Google-Smtp-Source: APXvYqxnAP+Y8k9UrhDRFmoqChxXzY7G77JPPpcxaV1o12NeuLgBmjkxVLyh2fr+9EthJ4i0rJsLGw== X-Received: by 2002:adf:efc8:: with SMTP id i8mr30173164wrp.164.1552501685667; Wed, 13 Mar 2019 11:28:05 -0700 (PDT) Received: from lindisfarne.localdomain (host-89-242-186-210.as13285.net. [89.242.186.210]) by smtp.gmail.com with ESMTPSA id b3sm2793929wmj.15.2019.03.13.11.28.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Mar 2019 11:28:05 -0700 (PDT) From: Phillip Wood To: Git Mailing List Cc: Junio C Hamano , Phillip Wood Subject: [PATCH 2/4] cherry-pick/revert: document --rerere-autoupdate Date: Wed, 13 Mar 2019 18:27:54 +0000 Message-Id: <20190313182756.8076-2-phillip.wood123@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190313182756.8076-1-phillip.wood123@gmail.com> References: <20190313182756.8076-1-phillip.wood123@gmail.com> Reply-To: Phillip Wood MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Phillip Wood This option was missing from the man pages. --- Documentation/git-cherry-pick.txt | 5 +++++ Documentation/git-revert.txt | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt index b8cfeec67e..d64e72462f 100644 --- a/Documentation/git-cherry-pick.txt +++ b/Documentation/git-cherry-pick.txt @@ -148,6 +148,11 @@ effect to your index in a row. Pass the merge strategy-specific option through to the merge strategy. See linkgit:git-merge[1] for details. +--rerere-autoupdate:: +--no-rerere-autoupdate:: + Allow the rerere mechanism to update the index with the + result of auto-conflict resolution if possible. + SEQUENCER SUBCOMMANDS --------------------- include::sequencer.txt[] diff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt index 837707a8fd..6afccb2f1e 100644 --- a/Documentation/git-revert.txt +++ b/Documentation/git-revert.txt @@ -101,6 +101,11 @@ effect to your index in a row. Pass the merge strategy-specific option through to the merge strategy. See linkgit:git-merge[1] for details. +--rerere-autoupdate:: +--no-rerere-autoupdate:: + Allow the rerere mechanism to update the index with the + result of auto-conflict resolution if possible. + SEQUENCER SUBCOMMANDS --------------------- include::sequencer.txt[] From patchwork Wed Mar 13 18:27:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phillip Wood X-Patchwork-Id: 10851631 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 A89476C2 for ; Wed, 13 Mar 2019 18:28:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 91EE629F5B for ; Wed, 13 Mar 2019 18:28:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 86A0E29F60; Wed, 13 Mar 2019 18:28:11 +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 3C99B29F5B for ; Wed, 13 Mar 2019 18:28:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726512AbfCMS2J (ORCPT ); Wed, 13 Mar 2019 14:28:09 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:45559 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726033AbfCMS2I (ORCPT ); Wed, 13 Mar 2019 14:28:08 -0400 Received: by mail-wr1-f66.google.com with SMTP id h99so3088541wrh.12 for ; Wed, 13 Mar 2019 11:28:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=2eeGrn/AD0ujkwtoyCIDI3CmNvtFnGH4/0u4v9UQwdE=; b=tsPwPumRqzGVy4iNpwBBAZ501GPtHTw+D8ZLpr0QhKk5HEne0NFDbA0pV1+5+bLUew MQPBefay9Qr3+uxa84ouQIDIe4ZsFt4/lfcsSxVa+OnrdbiJ6Ju/6z7kIj6o7MLfGsKG sSLGuADE/2SUJMMr25HyS3uiAoHDqTw/MNPDILvM54opqfS48V6se8VIusjLsvTETYKn 9lQNwlifMUviZHppijZy8vg6hMs6Hh2XoJVMonaFzggLDKTs/XgheISRTpHOUcgxnd3s HyS7Jw8GtIIGatFhyKe0j2Ago77x95SJ2atabKa+7WjAu+7mTyAFdzmgmE1Tg1yhf+B3 sT6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=2eeGrn/AD0ujkwtoyCIDI3CmNvtFnGH4/0u4v9UQwdE=; b=CO2mz9ZKOmHyKM4xSfzQmQ0axVzbgOFatA+3CqL1R/aLV8Gf9OBVuWVs+FbRLeDAIp 3fcNBQSdoF7dIKAaPR69BW20y9AqwSTtBUK9S8owzabT37TsD9z6AGM1mHWIzthGwUI8 lvg420xM4/+6M1zCGUypuNVJKH4wCw0rXiWJFRSAjCKvQ7KLmCGhQGGf1JhPpPDuN49V hyGz3kleCMbKAIcplVob5P2M4e8hvguA/48qGAI9PgTSx1+i3WOcGDYEmWjRJG9/B1bb lCh8NUeUTuezciV4P8rY1Q7fkfkLVLg0yb4TfbCRDrCBOpsmseK4wDHHwC2YqGFds3kj WjEQ== X-Gm-Message-State: APjAAAUQ9AiJZPgV4eQb5U6S5KXRafnFPwyHrzyROVIZvvp5nMoViZyI jd6L2P8Z9zLk1eyp1gfObDVfTSH5xHf9HQ== X-Google-Smtp-Source: APXvYqyxMHVfeUMi149k0NvjqFeOEDsL0XnrF2ucQaQaLukvlc+lf/sqX5smyH1nfBItLGMYvtmG+A== X-Received: by 2002:adf:b64e:: with SMTP id i14mr22648885wre.10.1552501686565; Wed, 13 Mar 2019 11:28:06 -0700 (PDT) Received: from lindisfarne.localdomain (host-89-242-186-210.as13285.net. [89.242.186.210]) by smtp.gmail.com with ESMTPSA id b3sm2793929wmj.15.2019.03.13.11.28.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Mar 2019 11:28:06 -0700 (PDT) From: Phillip Wood To: Git Mailing List Cc: Junio C Hamano , Phillip Wood Subject: [PATCH 3/4] am: document --rerere-autoupdate Date: Wed, 13 Mar 2019 18:27:55 +0000 Message-Id: <20190313182756.8076-3-phillip.wood123@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190313182756.8076-1-phillip.wood123@gmail.com> References: <20190313182756.8076-1-phillip.wood123@gmail.com> Reply-To: Phillip Wood MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Phillip Wood This option was missing from the man page. Signed-off-by: Phillip Wood --- Documentation/git-am.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 6f6c34b0f4..fc3b993c33 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -99,6 +99,11 @@ default. You can use `--no-utf8` to override this. am.threeWay configuration variable. For more information, see am.threeWay in linkgit:git-config[1]. +--rerere-autoupdate:: +--no-rerere-autoupdate:: + Allow the rerere mechanism to update the index with the + result of auto-conflict resolution if possible. + --ignore-space-change:: --ignore-whitespace:: --whitespace=