diff options
Diffstat (limited to 'Omni/Agent/Git.hs')
| -rw-r--r-- | Omni/Agent/Git.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Omni/Agent/Git.hs b/Omni/Agent/Git.hs index 7ee8a16..cf9a122 100644 --- a/Omni/Agent/Git.hs +++ b/Omni/Agent/Git.hs @@ -144,10 +144,10 @@ git dir args = do syncWithLive :: FilePath -> IO () syncWithLive repo = do Log.info ["git", "syncing with live"] - git repo ["fetch", "origin", "live"] - + -- git repo ["fetch", "origin", "live"] -- Optional + -- Try rebase, if fail, abort - let cmd = (Process.proc "git" ["rebase", "origin/live"]) {Process.cwd = Just repo} + let cmd = (Process.proc "git" ["rebase", "live"]) {Process.cwd = Just repo} (code, _, err) <- Process.readCreateProcessWithExitCode cmd "" case code of Exit.ExitSuccess -> pure () |
