diff options
author | Joey Hess <joeyh@joeyh.name> | 2017-02-17 14:04:43 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2017-02-17 14:04:43 -0400 |
commit | 615053c624b357520ef01db60c58e60d848a44bd (patch) | |
tree | 90bcd7299da5767ddab3eaabb335c55b9a13a9be /Command/Merge.hs | |
parent | 5b64144c2fb989f9799c1ec328b442b504b1d10f (diff) |
post-recive hook to make updateInstead work in direct mode and adjusted branches
* Added post-recieve hook, which makes updateInstead work with direct
mode and adjusted branches.
* init: Set up the post-receive hook.
This commit was sponsored by Fernando Jimenez on Patreon.
Diffstat (limited to 'Command/Merge.hs')
-rw-r--r-- | Command/Merge.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Command/Merge.hs b/Command/Merge.hs index 4f1913978..80a8227d1 100644 --- a/Command/Merge.hs +++ b/Command/Merge.hs @@ -17,9 +17,9 @@ cmd = command "merge" SectionMaintenance paramNothing (withParams seek) seek :: CmdParams -> CommandSeek -seek ps = do - withNothing mergeBranch ps - withNothing mergeSynced ps +seek _ = do + commandAction mergeBranch + commandAction mergeSynced mergeBranch :: CommandStart mergeBranch = do |