From patchwork Thu Mar 14 19:12:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phillip Wood X-Patchwork-Id: 10853433 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 4EC871850 for ; Thu, 14 Mar 2019 19:12:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3C9A12A6CC for ; Thu, 14 Mar 2019 19:12:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3119A2A6CE; Thu, 14 Mar 2019 19:12:59 +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 97CF32A6CC for ; Thu, 14 Mar 2019 19:12:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727404AbfCNTM4 (ORCPT ); Thu, 14 Mar 2019 15:12:56 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:36359 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726998AbfCNTMz (ORCPT ); Thu, 14 Mar 2019 15:12:55 -0400 Received: by mail-wm1-f68.google.com with SMTP id e16so3884727wme.1 for ; Thu, 14 Mar 2019 12:12:54 -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=LA0k/QxaFAJVbRbI8vi5HxthdDk1FBIgqgY41+1weJE=; b=m+dpFwAGG81LE7GaGhbRjGOKrKtX7BIkUF33NUbiayR/KWJN3jc1Fx33WbO8QWklwO 9nwGWGCqj+y5bQKe3jF4RytqmSNf6TI+oDCY272SqFM1tp7yHS1qjOSM7kviqOT1WKD9 u5WiEX0hz/YN+zS+bm3pShg32PW/W9XG05S3+QDtu/3DAykLpI6pOj0ravaCG1tWkRmJ Foa93XiRIxuCMjP9X764sXqYnBfkmWzQ77oPHSAIRv6JUraOl8DFTKyiG/I7bSoD8vB/ AnGpm19grNtPgy9jXGLJdTeRoQ+Giz54KO2wuHa/dZv53lh/3Tu1zPpZaM+hDXtpu+rQ F90A== 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=LA0k/QxaFAJVbRbI8vi5HxthdDk1FBIgqgY41+1weJE=; b=fvOwadNW8phcSGoyxs22Em/J1y1SgCgqGXJA4TK5ZULxWaUmAHhDTLwd0P1ajycQGa ek7W1SF1xtUWqOt/kHKlg58sYwqK9cznne4RJ8JHIuS4btyaN4NMrnXLel9Kfop/4hEY Gb7lT8HEy1VNVrsmULOxwfMtjI1AKb5RDBkx7C2V97PB1ZYoSBhBa5Zkm/peanLQiZTU xQ6kJ5D/fDgWbNUyvuabOnIhXa0nqUms1zOCaVJswsf2SuUJ5jJ1VdWL8skoKD/+tM+k kWZjxWfYsRtnTiK1k7N5drP+sAfYMKrxkTkIOOGpkMi1j1jtrq5VPzBBso2ufw/pDkvC bOLA== X-Gm-Message-State: APjAAAVi3wCe7GZgQXjyvrGh8LnMIEs8CjrdOx1Gmwp7GY5Lca6B/ngT dQyU8qvONrXxe1xGJjF34X14PBTm/Q+ikQ== X-Google-Smtp-Source: APXvYqwBXbt0jHqxE/AmEawLBR40YHfiIdDU1Ix+5qcZu27psqmNl/uZrHS7s0o4wULEvP2sASFnVg== X-Received: by 2002:a1c:b38a:: with SMTP id c132mr28172wmf.49.1552590773187; Thu, 14 Mar 2019 12:12:53 -0700 (PDT) Received: from lindisfarne.localdomain (host-89-242-186-210.as13285.net. [89.242.186.210]) by smtp.gmail.com with ESMTPSA id a2sm20328788wrr.60.2019.03.14.12.12.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Mar 2019 12:12:52 -0700 (PDT) From: Phillip Wood To: Git Mailing List , Junio C Hamano Cc: Johannes Schindelin , Phillip Wood Subject: [PATCH v2 1/2] am/cherry-pick/rebase/revert: document --rerere-autoupdate Date: Thu, 14 Mar 2019 19:12:32 +0000 Message-Id: <20190314191234.25553-2-phillip.wood123@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190314191234.25553-1-phillip.wood123@gmail.com> References: <20190314191234.25553-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 of these commands. Signed-off-by: Phillip Wood --- Documentation/git-am.txt | 5 +++++ Documentation/git-cherry-pick.txt | 5 +++++ Documentation/git-rebase.txt | 5 +++++ Documentation/git-revert.txt | 5 +++++ 4 files changed, 20 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=