RE: [PATCH v13] Support auto-merge for meld to follow the vim-diff behavior

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Subject: RE: [PATCH v13] Support auto-merge for meld to follow the vim-diff behavior
From: <lin.sun@xxxxxxx>
Date: Sun, 12 Jul 2020 22:07:13 +0800
Cc: <git@xxxxxxxxxxxxxxx>, "'sunlin'" <sunlin7@xxxxxxxxx>, 'Đoàn Trần Công Danh' <congdanhqx@xxxxxxxxx>
In-reply-to: <261a01d655a0$71077210$53165630$@zoom.us>
References: <pull.781.v12.git.git.1594178716840.gitgitgadget@gmail.com> <pull.781.v13.git.git.1594254906647.gitgitgadget@gmail.com> <xmqqh7uhz98q.fsf@gitster.c.googlers.com> <261a01d655a0$71077210$53165630$@zoom.us>
Thread-index: AQGL+c9r+Sj3YnB8Xlh5VXkiFBL/EQG/MxNQAccWvdYCUW6JKAKGaVJn

Hi Junio,

I had add a new c function ` git_config_bool_or_str()` to support get the 
configured value for true/false/auto with git. It will make the `mergetool/meld`
only calling `git config` once for getting the `useAutoMerge`.

Please review the [PATH v16], thanks.
https://lore.kernel.org/git/pull.781.v16.git.git.1594544903477.gitgitgadget@xxxxxxxxx

Regards
Lin

Follow-Ups:
- RE: [PATCH v13] Support auto-merge for meld to follow the vim-diff behavior
  - From: lin.sun

References:
- [PATCH v12] Support auto-merge for meld to follow the vim-diff behavior
  - From: sunlin via GitGitGadget
- [PATCH v13] Support auto-merge for meld to follow the vim-diff behavior
  - From: sunlin via GitGitGadget
- Re: [PATCH v13] Support auto-merge for meld to follow the vim-diff behavior
  - From: Junio C Hamano
- RE: [PATCH v13] Support auto-merge for meld to follow the vim-diff behavior
  - From: lin.sun

Prev by Date: Re: [PATCH v4 0/9] Allow overriding the default name of the default branch
Next by Date: [PATCH] bundle: improve message when unknown hash algorithm detected
Previous by thread: Re: [PATCH v13] Support auto-merge for meld to follow the vim-diff behavior
Next by thread: RE: [PATCH v13] Support auto-merge for meld to follow the vim-diff behavior
Index(es):
- Date
- Thread

[Index of Archives] [Linux Kernel Development] [Gcc Help] [IETF Annouce] [DCCP] [Netdev] [Networking] [Security] [V4L] [Bugtraq] [Yosemite] [MIPS Linux] [ARM Linux] [Linux Security] [Linux RAID] [Linux SCSI] [Fedora Users]