[PATCH v7 0/2] mergetool: add automerge configuration

From: Seth House <seth@eseth.com>
Date: Dec 28, 2020, 00:41 UTC
Message-ID: <20201228004152.522421-1-seth@eseth.com>
In-Reply-To: <20201227205835.502556-1-seth@eseth.com>

Changes since v6:

 * Incorporated Junio's help and advice:

   * Rebased v7 off of the correct v5 version.
   * Signed off on Felipe's commit. (Although I have minor qualms with
     Felipe's various wording and even the name of the flag it is
     decidedly not worth burdening the list with bike-shedding.)

Changes since v5:

 * Add per-tool configuration that Felipe has a "deep philosophical"
   opposition to adding.

Felipe Contreras (1):
  mergetool: add automerge configuration

Seth House (1):
  mergetool: Add per-tool support for the autoMerge flag

 Documentation/config/mergetool.txt |  6 ++++++
 git-mergetool.sh                   | 20 ++++++++++++++++++++
 t/t7610-mergetool.sh               | 18 ++++++++++++++++++
 3 files changed, 44 insertions(+)

-- 
2.29.2

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.