diff options
| author | Joey Hess <joey@kitenet.net> | 2014-08-19 16:47:00 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-08-19 16:47:00 -0400 |
| commit | 1ada0f10141405c8c20decddf893eb5186be8581 (patch) | |
| tree | 41ae15ba5f75f24d85aeaf2f4d6b79cd717bc226 | |
| parent | 4ae9578e3644cb3a11c105281b043721400f74cb (diff) | |
fix ref name
| -rw-r--r-- | src/wrapper.hs | 2 |
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 () |
