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. --- propellor.cabal | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'propellor.cabal') diff --git a/propellor.cabal b/propellor.cabal index 7c781c43..1366d89e 100644 --- a/propellor.cabal +++ b/propellor.cabal @@ -16,8 +16,9 @@ Extra-Source-Files: CHANGELOG Makefile config-simple.hs - config-joey.hs + joeyconfig.hs config.hs + contrib/post-checkout-hook debian/changelog debian/README.Debian debian/compat -- cgit v1.2.3