make merge commit on export that preserves the import history
This commit is contained in:
parent
d1c283b691
commit
2bd0e07ed8
4 changed files with 47 additions and 8 deletions
|
@ -266,7 +266,7 @@ seekRemote remote branch msubdir = do
|
|||
Nothing -> giveup $ "Unable to find base tree for branch " ++ fromRef branch
|
||||
|
||||
trackingcommit <- fromtrackingbranch Git.Ref.sha
|
||||
let importcommitconfig = ImportCommitConfig trackingcommit ManualCommit importmessage
|
||||
let importcommitconfig = ImportCommitConfig trackingcommit AutomaticCommit importmessage
|
||||
let commitimport = commitRemote remote branch tb trackingcommit importtreeconfig importcommitconfig
|
||||
|
||||
importabletvar <- liftIO $ newTVarIO Nothing
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue