summaryrefslogtreecommitdiff
path: root/propellor.hs
diff options
context:
space:
mode:
authorJoey Hess2014-04-24 18:10:23 -0400
committerJoey Hess2014-04-24 18:10:23 -0400
commitc4f364b249b810410d329a932dea883f36b9a712 (patch)
treed4d4ee86efba15249284a41841e17654d901f1f3 /propellor.hs
parent792957153ca9c22de28da7be83940aa5e07af0fa (diff)
parent72a6b1c759906025fd6761aeb5ef51e64e60abd7 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'propellor.hs')
-rw-r--r--propellor.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/propellor.hs b/propellor.hs
index e4653f30..c7727751 100644
--- a/propellor.hs
+++ b/propellor.hs
@@ -74,7 +74,7 @@ wrapper args propellordir propellorbin = do
void $ boolSystem "git" [Param "remote", Param "add", Param "upstream", Param srcrepo]
-- Connect synthetic git repo with upstream history so
-- 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.
when fromsrcdir $ do
void $ boolSystem "git" [Param "fetch", Param "upstream"]