projects / git-annex.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5abb0f8) | patch
refactor
authorJoey Hess <joeyh@joeyh.name>
Mon, 7 Sep 2020 17:26:16 +0000 (13:26 -0400)
committerJoey Hess <joeyh@joeyh.name>
Mon, 7 Sep 2020 17:26:16 +0000 (13:26 -0400)
commitf4c4b89aa3a04ee40293b29629e278293fe7f69f
treeb15bf5e3066e16173dd63d5412f1bee194c91637tree | snapshot
parent5abb0f86c4c513f0550416598a169917ae8fb820commit | diff
refactor

Make all calls to git merge go through autoMergeFrom, in preparation
for fine-tuning git merge's config for automatic merge conflict
resolution.

This commit was sponsored by Ryan Newton on Patreon.
Annex/AdjustedBranch.hs diff | blob | history
Annex/AutoMerge.hs diff | blob | history
Command/Sync.hs diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.