summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2014-04-24 13:14:05 -0400
committerJoey Hess2014-04-24 13:14:05 -0400
commit03ead14749f5db167e5e41af3ca441ae25a2142e (patch)
treed4cc4457f18ea43403ac22d184a441fccf13aee3
parent9c2428cb43a902fb64230b10ae7b4440e7e61493 (diff)
comment typo
-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"]