From 9556734c02a0b05764e83419ae72710908419cdc Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 7 Mar 2016 18:20:31 -0400 Subject: 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. --- doc/index.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') 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]] -- cgit v1.3-2-g0d8e