[v6,0/1] mergetool: add automerge configuration

Message

Seth House Dec. 27, 2020, 8:58 p.m. UTC

Sorry for the slow turnaround on this. I haven't used Git via email
patches before now so it took me quite a few hours to read through
tutorials, configure git-send-email and fight missing Perl libs. Please
let me know if I did anything incorrectly! I should be able to
contribute more quickly from now on.

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                   | 13 +++++++++++++
 t/t7610-mergetool.sh               | 18 ++++++++++++++++++
 3 files changed, 37 insertions(+)

Comments

Felipe Contreras Dec. 28, 2020, 1:02 a.m. UTC | #1

Seth House wrote:
> Sorry for the slow turnaround on this. I haven't used Git via email
> patches before now so it took me quite a few hours to read through
> tutorials, configure git-send-email and fight missing Perl libs.

What distribution are you using?

> Changes since v5:

This is not v6 of my patch series; it's v1 of yours, which I think
should have a different title.

What happens when I want to do v6?

Other than that (and the fact that you initially used the wrong version
as a baseline), I'm fine with your approach of doing a patch on top of
mine.

Cheers.