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. --- config.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config.hs') diff --git a/config.hs b/config.hs index 07959a0a..97d90636 120000 --- a/config.hs +++ b/config.hs @@ -1 +1 @@ -config-joey.hs \ No newline at end of file +joeyconfig.hs \ No newline at end of file -- cgit v1.3-2-g0d8e