summaryrefslogtreecommitdiff
path: root/doc/index.mdwn
diff options
context:
space:
mode:
authorJoey Hess2016-03-07 18:20:31 -0400
committerJoey Hess2016-03-07 18:20:31 -0400
commit9556734c02a0b05764e83419ae72710908419cdc (patch)
treed60d67bb93a978f0cdce026d89ad46ae61d68487 /doc/index.mdwn
parent2be51d0332a14fae68d18e61ed448a659ed789b1 (diff)
got tired of needing to cherry-pick changes into joeyconfig, wrote a hook
So, when I merge some branch into joeyconfig, config.hs will automatically be updated to point to joeyconfig.hs again, even if the merge changes it. And, when I merge joeyconfig into master, config.hs will be pointed back to config-simple.hs This may also be useful for others who maintain a branch like joeyconfig.
Diffstat (limited to 'doc/index.mdwn')
-rw-r--r--doc/index.mdwn2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/index.mdwn b/doc/index.mdwn
index 5961ae87..52c23021 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -4,7 +4,7 @@
[[Install]]
[API documentation](http://hackage.haskell.org/package/propellor)
[[Other Documentation|documentation]]
-[Sample config file](http://git.joeyh.name/?p=propellor.git;a=blob;f=config-joey.hs)
+[Sample config file](http://git.joeyh.name/?p=propellor.git;a=blob;f=joeyconfig.hs)
[[Security]]
[[Todo]]
[[Forum]]