split more stuff out of Git.hs
This commit is contained in:
parent
2b24e16a63
commit
02f1bd2bf4
20 changed files with 197 additions and 179 deletions
|
@ -12,6 +12,7 @@ import qualified Git.UnionMerge
|
|||
import qualified Git.Config
|
||||
import qualified Git.Construct
|
||||
import qualified Git.Branch
|
||||
import qualified Git.Index
|
||||
import qualified Git
|
||||
|
||||
header :: String
|
||||
|
@ -42,7 +43,7 @@ main :: IO ()
|
|||
main = do
|
||||
[aref, bref, newref] <- map Git.Ref <$> parseArgs
|
||||
g <- Git.Config.read =<< Git.Construct.fromCwd
|
||||
_ <- Git.useIndex (tmpIndex g)
|
||||
_ <- Git.Index.override (tmpIndex g)
|
||||
setup g
|
||||
Git.UnionMerge.merge aref bref g
|
||||
_ <- Git.Branch.commit "union merge" newref [aref, bref] g
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue