mergetool: add automerge configuration
Get series with b4
b4 am [email protected]Versions newest first
- v6 Latest0 of 1 patch 1 replyIn review
Changes in v6 from the cover letter
* Add per-tool configuration that Felipe has a "deep philosophical" opposition to adding.
Patches in v6 No applies recorded yet
The patch the cover letter announces is not in this archive.
Reviews trailers per patch
| Patch | Seth House | Junio C Hamano | Johannes Sixt | Felipe Contreras |
|---|---|---|---|---|
| Series | Original-idea-by Original-idea-by Original-idea-by Original-idea-by Helped-by | Helped-by Helped-by Helped-by Helped-by Helped-by | Helped-by Helped-by Helped-by | Original-implementation-by Helped-by Original-implementation-by |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 4 reviewers.
Cover letter [PATCH v6 0/1] mergetool: add automerge configuration
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(+)
Signature · 1 line
2.29.2