From patchwork Wed Oct 24 16:25:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denton Liu X-Patchwork-Id: 10654799 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 CB8EB13A9 for ; Wed, 24 Oct 2018 16:25:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B62C62ADA1 for ; Wed, 24 Oct 2018 16:25:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AA35C2ADE8; Wed, 24 Oct 2018 16:25:36 +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 2CC0B2ADA1 for ; Wed, 24 Oct 2018 16:25:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726577AbeJYAyS (ORCPT ); Wed, 24 Oct 2018 20:54:18 -0400 Received: from mail-it1-f194.google.com ([209.85.166.194]:38184 "EHLO mail-it1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726433AbeJYAyS (ORCPT ); Wed, 24 Oct 2018 20:54:18 -0400 Received: by mail-it1-f194.google.com with SMTP id i76-v6so7345947ita.3 for ; Wed, 24 Oct 2018 09:25:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=3mXGWzGhErDxZa72gdjGcEc9BiPoCF6kh6D4G35+gCc=; b=JrOQIYp0d1WSwp6zRfC0NEg4s/8gNj1osQ8N2xuZhvxB9B+K1gL82VsHxicRbkOrRs jJ6H+Hv47O9ZLGrMGaEIReP5Sxaew5VP1F3NnU2rRuOI1fpMh0ZXQisqm3/g/5asOja8 NRG4vJebjdfHae/FFRwIoIv92rE0xRq+Flk9NUqyyTC+p+GDQXLENMeYeTfOXtjZDjsR ireYC4cgVAXzO72jX+D83Lx2nGkXDfXtR9XAd5OcIBn9AI8C3uNG3f8JL9GJ42jg0Kxh bYKcuMw8nOL6cb6Tu6Q+xH71/ZVqakB8Qds6UFRZew6gneCq3sEMngjkY52gtAg2J4a3 hdpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=3mXGWzGhErDxZa72gdjGcEc9BiPoCF6kh6D4G35+gCc=; b=WVj0pfq/BOvVNPMIJYrwjGIyuvHgJVy7KdfoIDHPMluic3zsTDorJpLavwARICnSZ9 W0KiWT0ydDH4Er01jzmYaQ6wDs8c89wY3Y8HIhaI7A28sc8BzO3GsgcdoOMvg5rvJl5N myK3PkdZqJA/60UuQhkS78TrQkkCFiYH8FKj6pm1gmWr6EmoUpqjqB4Bjyx6OTTzsUbQ kbw5aCcAFr5ATpohlkHAXWvu47FWb64dybX/TpZu1n5E44NzHFYP+7/WcKWQ+XyBKpNe dSCQKy9fbc/4MAPJmWqnIbQb1lPjLigtJ7foS97xH2frteYC2Oizr22FzVLexiEUmjZf GNAQ== X-Gm-Message-State: AGRZ1gIHY1e3AU1/e/2ODqoG3ovC2aasBojCAj4tR/9Mbyp+Kn+jkctF rBwnmBSEFNLHCLWJNXKpETnazyH7 X-Google-Smtp-Source: AJdET5edXSDsV3OTLxr5c3ilgU3tJo1iiZcTwbM3UjnxZWXIYb1GrXa4Qs/7Lg/u6fAA2gFFLZUlgw== X-Received: by 2002:a24:4ad5:: with SMTP id k204-v6mr2064582itb.1.1540398333521; Wed, 24 Oct 2018 09:25:33 -0700 (PDT) Received: from archbookpro.localdomain (ktnron0919w-lp140-01-76-68-143-166.dsl.bell.ca. [76.68.143.166]) by smtp.gmail.com with ESMTPSA id m70-v6sm2838831itm.27.2018.10.24.09.25.32 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 Oct 2018 09:25:33 -0700 (PDT) Date: Wed, 24 Oct 2018 12:25:31 -0400 From: Denton Liu To: git@vger.kernel.org Cc: liu.denton@gmail.com, anmolmago@gmail.com, briankyho@gmail.com, david.lu97@outlook.com, shirui.wang@hotmail.com, davvid@gmail.com, gitster@pobox.com Subject: [PATCH v3 1/3] mergetool: accept -g/--[no-]gui as arguments Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In line with how difftool accepts a -g/--[no-]gui option, make mergetool accept the same option in order to use the `merge.guitool` variable to find the default mergetool instead of `merge.tool`. Signed-off-by: Denton Liu Signed-off-by: Anmol Mago Signed-off-by: Brian Ho Signed-off-by: David Lu Signed-off-by: Ryan Wang Acked-by: David Aguilar --- Documentation/git-mergetool.txt | 11 +++++++++++ git-mergetool--lib.sh | 16 +++++++++++----- git-mergetool.sh | 11 +++++++++-- 3 files changed, 31 insertions(+), 7 deletions(-) diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt index 3622d6648..0c7975a05 100644 --- a/Documentation/git-mergetool.txt +++ b/Documentation/git-mergetool.txt @@ -79,6 +79,17 @@ success of the resolution after the custom tool has exited. Prompt before each invocation of the merge resolution program to give the user a chance to skip the path. +-g:: +--gui:: + When 'git-mergetool' is invoked with the `-g` or `--gui` option + the default merge tool will be read from the configured + `merge.guitool` variable instead of `merge.tool`. + +--no-gui:: + This overrides a previous `-g` or `--gui` setting and reads the + default merge tool will be read from the configured `merge.tool` + variable. + -O:: Process files in the order specified in the , which has one shell glob pattern per line. diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index 9a8b97a2a..83bf52494 100644 --- a/git-mergetool--lib.sh +++ b/git-mergetool--lib.sh @@ -350,17 +350,23 @@ guess_merge_tool () { } get_configured_merge_tool () { - # Diff mode first tries diff.tool and falls back to merge.tool. - # Merge mode only checks merge.tool + # If first argument is true, find the guitool instead + if test "$1" = true + then + gui_prefix=gui + fi + + # Diff mode first tries diff.(gui)tool and falls back to merge.(gui)tool. + # Merge mode only checks merge.(gui)tool if diff_mode then - merge_tool=$(git config diff.tool || git config merge.tool) + merge_tool=$(git config diff.${gui_prefix}tool || git config merge.${gui_prefix}tool) else - merge_tool=$(git config merge.tool) + merge_tool=$(git config merge.${gui_prefix}tool) fi if test -n "$merge_tool" && ! valid_tool "$merge_tool" then - echo >&2 "git config option $TOOL_MODE.tool set to unknown tool: $merge_tool" + echo >&2 "git config option $TOOL_MODE.${gui_prefix}tool set to unknown tool: $merge_tool" echo >&2 "Resetting to default..." return 1 fi diff --git a/git-mergetool.sh b/git-mergetool.sh index d07c7f387..01b9ad59b 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -9,7 +9,7 @@ # at the discretion of Junio C Hamano. # -USAGE='[--tool=tool] [--tool-help] [-y|--no-prompt|--prompt] [-O] [file to merge] ...' +USAGE='[--tool=tool] [--tool-help] [-y|--no-prompt|--prompt] [-g|--gui|--no-gui] [-O] [file to merge] ...' SUBDIRECTORY_OK=Yes NONGIT_OK=Yes OPTIONS_SPEC= @@ -389,6 +389,7 @@ print_noop_and_exit () { main () { prompt=$(git config --bool mergetool.prompt) + gui_tool=false guessed_merge_tool=false orderfile= @@ -414,6 +415,12 @@ main () { shift ;; esac ;; + --no-gui) + gui_tool=false + ;; + -g|--gui) + gui_tool=true + ;; -y|--no-prompt) prompt=false ;; @@ -443,7 +450,7 @@ main () { if test -z "$merge_tool" then # Check if a merge tool has been configured - merge_tool=$(get_configured_merge_tool) + merge_tool=$(get_configured_merge_tool $gui_tool) # Try to guess an appropriate merge tool if no tool has been set. if test -z "$merge_tool" then From patchwork Wed Oct 24 16:25:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denton Liu X-Patchwork-Id: 10654801 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 5A57214BB for ; Wed, 24 Oct 2018 16:25:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 46DC52ADA1 for ; Wed, 24 Oct 2018 16:25:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3A7B42AE01; Wed, 24 Oct 2018 16:25:42 +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 C8F6F2ADA1 for ; Wed, 24 Oct 2018 16:25:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726633AbeJYAyX (ORCPT ); Wed, 24 Oct 2018 20:54:23 -0400 Received: from mail-it1-f196.google.com ([209.85.166.196]:53075 "EHLO mail-it1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726433AbeJYAyX (ORCPT ); Wed, 24 Oct 2018 20:54:23 -0400 Received: by mail-it1-f196.google.com with SMTP id 134-v6so6934028itz.2 for ; Wed, 24 Oct 2018 09:25:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=8GhCs+6tkhSRPA7EjI8G02AMns5HyrJ6aJ4mS5W2LEE=; b=ut2dUhYYpsSw3/dlXtGHA22dSpCotuzBGWbNCQ5d32r/HM1tJzbTxVZhfQhJhci80B psFWKKURsbrdsuPfBbRwE79tu6Tc5WMqADjLfszAHAD54fNUMHY0AXiHZKOwgrVCfBOB mdmzCPsdLQ/kUcAi7jgwJJXx9zXyyYtqmXAJ4qOoqSkxv8IMWL66r625VKGXSeBR5OyJ gTSrGnJlLy7/ELyqWJ4IoSeoAq0qFtYiBLwHDWi4T5HK+h/GLbo3RFrfNLFNuB3XLTet cAz6VtaA5tfAZ3nb1MLzcVSGk56V8GYV/H6v2cMbFCIHNOifXdPubqLF7wbD69KuEWKz zHvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=8GhCs+6tkhSRPA7EjI8G02AMns5HyrJ6aJ4mS5W2LEE=; b=OViQra5NOHijW0a/s6TErt38YSoy+5105EG3Gg80I87r5B1a/Zv+jf6QcAR5rxGdiU Zy9CUGwDRzNn9CNisuhjKGm+aniHs/bl7whTBx5irAedGbphkBl+FV203OGVngjUrES7 5FMOthCNpzS+6acA0/T8SveH1MaL8yARG2OebOdbuD+bXOtbZNOGBS5eECc/QI+w06Rg PAeHtxRHRUhkUC84AxY69BCmm0/SILkwU8tNBRfpgKNvDkhIHxb+ZCsQ+nBp1GWXvMgl yc8CvZibvLg/1vIqRF9stzbHuKonrIet9mtFS9fvl6PpegXgsOu37APajlYH2JYHq58i azaw== X-Gm-Message-State: AGRZ1gIiS+8YTkuVeuiwR9KtlfSte0Y44TfC/3a9sVMHa2jpXLbxGenM cX+r5h2vPlfEsUCE6Ih4eBmxBN1h X-Google-Smtp-Source: AJdET5fuj7HTUnzfkKBv6L0Ranv3Sv3wlWxWziSAhQkhQOInddWuNGcEVPG6UTY0J8iIiy2rivr+9A== X-Received: by 2002:a05:660c:802:: with SMTP id j2mr97656itk.13.1540398339675; Wed, 24 Oct 2018 09:25:39 -0700 (PDT) Received: from archbookpro.localdomain (ktnron0919w-lp140-01-76-68-143-166.dsl.bell.ca. [76.68.143.166]) by smtp.gmail.com with ESMTPSA id g19-v6sm1801731ioh.30.2018.10.24.09.25.38 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 Oct 2018 09:25:39 -0700 (PDT) Date: Wed, 24 Oct 2018 12:25:37 -0400 From: Denton Liu To: git@vger.kernel.org Cc: liu.denton@gmail.com, anmolmago@gmail.com, briankyho@gmail.com, david.lu97@outlook.com, shirui.wang@hotmail.com, davvid@gmail.com, gitster@pobox.com Subject: [PATCH v3 2/3] completion: support `git mergetool --[no-]gui` Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) 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: Denton Liu Signed-off-by: Anmol Mago Signed-off-by: Brian Ho Signed-off-by: David Lu Signed-off-by: Ryan Wang --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index db7fd87b6..a45b4a050 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1833,7 +1833,7 @@ _git_mergetool () return ;; --*) - __gitcomp "--tool= --prompt --no-prompt" + __gitcomp "--tool= --prompt --no-prompt --gui --no-gui" return ;; esac From patchwork Wed Oct 24 16:25:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denton Liu X-Patchwork-Id: 10654803 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 5EB0714BB for ; Wed, 24 Oct 2018 16:25:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4B01E2ADA1 for ; Wed, 24 Oct 2018 16:25:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3EB7D2ADE8; Wed, 24 Oct 2018 16:25:48 +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 DDD6F2ADA1 for ; Wed, 24 Oct 2018 16:25:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726685AbeJYAya (ORCPT ); Wed, 24 Oct 2018 20:54:30 -0400 Received: from mail-it1-f194.google.com ([209.85.166.194]:55738 "EHLO mail-it1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726433AbeJYAy3 (ORCPT ); Wed, 24 Oct 2018 20:54:29 -0400 Received: by mail-it1-f194.google.com with SMTP id c23-v6so6919528itd.5 for ; Wed, 24 Oct 2018 09:25:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=tzytoIrYsJVNSmRwvFFZR8A/gdo3pRyxqrbCj8K9wAs=; b=smJaHH/oZqZHz94jr7nJWuZb8JM529bfTHaEQm+imUL3GWJSg+MXKuvrhiVVnZ+dWf MPV+nflHzdJi8KNY3xpuMbV1f386QdZ1Q2dMuHO6jRc3EJjbAe8c4JSUiqyEF6sxgwy8 ITdGvHmHEE1h/nD/izcgid1gTmwZx662C/naPWkLOvUGsNsL4qUJa6tebIUHTgasIbyQ JLJqE5EKgntNZW1zmTGD/b2QBUPjf1SSv1kChLTkRn7H+eUWDeKlMnwaCXmLsFHrGdRE ZaF1EO/BIQtpHyb9sRJF4z0/nlOcl/XTvTdMzvK2Z9yKBB2aIv2/QXSIiShjqG3XAblC 5NZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=tzytoIrYsJVNSmRwvFFZR8A/gdo3pRyxqrbCj8K9wAs=; b=r+SHOtNDuRzZ/CjGQ73F6vn7xcnMyBMTVq/bO3Gt5wAvh8CPTOjH3S9ZOpk3E3TyY5 R2zgaVmbm42jVHxeclGFnArjcT/iwoHwIGmVyV+gFzaxfQTyDnuS4QGOTMlw6rg01J1e et9mfYNhjUHsbcOYD08gepHgaa+UYV65G4Ifij8zlSPUPtskg9XmBo01RWAlBYuHvRJN lr7uohEw/ZEgUjdQXF7TNRqK0RpKbJhDrHYycD7RW9kpOnrqFRJ3qEVJnMp4ajHhOBJi vFhB/8ysv1anie2BbZYT7jZmpm/+OC6VdGALqbJJuzFjrAo8e/16Qe2NrjxnT/RdyJvp G57w== X-Gm-Message-State: AGRZ1gJwJ1S8Y8yQaloR1DWhksw4PAoXhZH+rK0iGlDOmxjXP6XQTezH 3abjieJFJFi4E4w3vEuYJg3uhMxE X-Google-Smtp-Source: AJdET5fs8GptBvuVa+QPbpyxPQdvY3aNZaolpGp/kZsni0gGDN+lUQ0qLWYnXFWB1eZy1p7IX3UcJw== X-Received: by 2002:a02:a914:: with SMTP id n20-v6mr2352744jam.90.1540398345480; Wed, 24 Oct 2018 09:25:45 -0700 (PDT) Received: from archbookpro.localdomain (ktnron0919w-lp140-01-76-68-143-166.dsl.bell.ca. [76.68.143.166]) by smtp.gmail.com with ESMTPSA id j19-v6sm2823329itj.31.2018.10.24.09.25.44 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 Oct 2018 09:25:45 -0700 (PDT) Date: Wed, 24 Oct 2018 12:25:43 -0400 From: Denton Liu To: git@vger.kernel.org Cc: liu.denton@gmail.com, anmolmago@gmail.com, briankyho@gmail.com, david.lu97@outlook.com, shirui.wang@hotmail.com, davvid@gmail.com, gitster@pobox.com Subject: [PATCH v3 3/3] doc: document diff/merge.guitool config keys Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) 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: Denton Liu --- Documentation/diff-config.txt | 8 ++++++++ Documentation/merge-config.txt | 6 ++++++ 2 files changed, 14 insertions(+) diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt index 85bca83c3..e64d983c3 100644 --- a/Documentation/diff-config.txt +++ b/Documentation/diff-config.txt @@ -177,6 +177,14 @@ diff.tool:: Any other value is treated as a custom diff tool and requires that a corresponding difftool..cmd variable is defined. +diff.guitool:: + Controls which diff tool is used by linkgit:git-difftool[1] when + the -g/--gui flag is specified. This variable overrides the value + configured in `merge.guitool`. The list below shows the valid + built-in values. Any other value is treated as a custom diff tool + and requires that a corresponding difftool..cmd variable + is defined. + include::mergetools-diff.txt[] diff.indentHeuristic:: diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt index 662c2713c..a7f4ea90c 100644 --- a/Documentation/merge-config.txt +++ b/Documentation/merge-config.txt @@ -63,6 +63,12 @@ merge.tool:: Any other value is treated as a custom merge tool and requires that a corresponding mergetool..cmd variable is defined. +merge.guitool:: + Controls which merge tool is used by linkgit:git-mergetool[1] when the + -g/--gui flag is specified. The list below shows the valid built-in values. + Any other value is treated as a custom merge tool and requires that a + corresponding mergetool..cmd variable is defined. + include::mergetools-merge.txt[] merge.verbosity::