cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

comment typo

This commit is contained in:
Joey Hess 2014-04-24 13:14:05 -04:00
parent 9c2428cb43
commit 03ead14749
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
propellor.hs
View File

@ -74,7 +74,7 @@ wrapper args propellordir propellorbin = do
void $ boolSystem "git" [Param "remote", Param "add", Param "upstream", Param srcrepo] void $ boolSystem "git" [Param "remote", Param "add", Param "upstream", Param srcrepo]
-- Connect synthetic git repo with upstream history so -- Connect synthetic git repo with upstream history so
-- merging with upstream will work going forward. -- merging with upstream will work going forward.
-- Note -s outs is used to avoid getting any divergent -- Note -s ours is used to avoid getting any divergent
-- changes from upstream. -- changes from upstream.
when fromsrcdir $ do when fromsrcdir $ do
void $ boolSystem "git" [Param "fetch", Param "upstream"] void $ boolSystem "git" [Param "fetch", Param "upstream"]