From patchwork Sat Apr 6 13:27:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip Oakley X-Patchwork-Id: 10888221 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 952C215AC for ; Sat, 6 Apr 2019 13:27:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 69BAE28807 for ; Sat, 6 Apr 2019 13:27:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5E7AD28A59; Sat, 6 Apr 2019 13:27: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=-7.9 required=2.0 tests=BAYES_00,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 1B8D428807 for ; Sat, 6 Apr 2019 13:27:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726499AbfDFN1z (ORCPT ); Sat, 6 Apr 2019 09:27:55 -0400 Received: from smtp-out-4.talktalk.net ([62.24.135.68]:33540 "EHLO smtp-out-4.talktalk.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726353AbfDFN1y (ORCPT ); Sat, 6 Apr 2019 09:27:54 -0400 Received: from localhost.localdomain ([2.101.245.142]) by smtp.talktalk.net with SMTP id ClMPhui0snuQZClMPhhS4Q; Sat, 06 Apr 2019 14:27:53 +0100 X-Originating-IP: [2.101.245.142] X-Spam: 0 X-OAuthority: v=2.3 cv=echDgIMH c=1 sm=1 tr=0 a=mQgiQ6BlbOv19lEfDgieCg==:117 a=mQgiQ6BlbOv19lEfDgieCg==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=xtxXYLxNAAAA:8 a=hkU2WXdTQEN3TPVW-2gA:9 a=xts0dhWdiJbonKbuqhAr:22 From: Philip Oakley To: GitList Subject: [PATCH 1/2] rerere doc: quote `rerere.enabled` Date: Sat, 6 Apr 2019 14:27:46 +0100 Message-Id: <20190406132747.16376-2-philipoakley@iee.org> X-Mailer: git-send-email 2.21.0.windows.1.80.gdc2ae9a382 In-Reply-To: <20190406132747.16376-1-philipoakley@iee.org> References: <20190406132747.16376-1-philipoakley@iee.org> MIME-Version: 1.0 X-CMAE-Envelope: MS4wfIJSaphgkdVtW9NslD+hPLy9IwXyHxIv7UvRROOl6i31LV0/wJRzDkdOg8DD7W/EIyDVSIkuiNS40P/rwnxuzhfFU2cXzo6sCUT53CKNyG9Hj8cfjUb7 8JnlWLEB4IjbsvirAfkP5fgXNEU07oRUgza/z8WQFDkLA3Oxvkgg7rjCoxOHeH3FN+yEiVK9YuvO+A== Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Philip Oakley --- Noticed while attempting to train the Git-for-Windows rebasing- merge series. --- Documentation/git-rerere.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt index df310d2a58..95763d7581 100644 --- a/Documentation/git-rerere.txt +++ b/Documentation/git-rerere.txt @@ -24,7 +24,7 @@ on the initial manual merge, and applying previously recorded hand resolutions to their corresponding automerge results. [NOTE] -You need to set the configuration variable rerere.enabled in order to +You need to set the configuration variable `rerere.enabled` in order to enable this command.