summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2014-08-19 16:47:06 -0400
committerJoey Hess2014-08-19 16:47:06 -0400
commit922f916baf4da6435a390896e949d870e9a3dfab (patch)
tree05694a795c153df3fd45359d658fd9e6137ee8aa
parent2ed83d6fccf5727ef1bb7116d0e7952f20fb396d (diff)
parent1ada0f10141405c8c20decddf893eb5186be8581 (diff)
Merge branch 'joeyconfig'
-rw-r--r--src/wrapper.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wrapper.hs b/src/wrapper.hs
index 6912e204..c7241991 100644
--- a/src/wrapper.hs
+++ b/src/wrapper.hs
@@ -140,7 +140,7 @@ setupupstreammaster newref propellordir = do
n (" A newer upstream version is available in " ++ distrepo)
if havebranch
then n (" To merge it, run: git merge " ++ upstreambranch)
- else n (" To merge it, find the most recent commit in your repository's history that corresponds to an upstream release of propellor, and set refs/heads/" ++ upstreambranch ++ " to it. Then run propellor again." )
+ else n (" To merge it, find the most recent commit in your repository's history that corresponds to an upstream release of propellor, and set refs/remotes/" ++ upstreambranch ++ " to it. Then run propellor again." )
n ""
fetchUpstreamBranch :: FilePath -> FilePath -> IO ()