summaryrefslogtreecommitdiff
path: root/config.hs
diff options
context:
space:
mode:
authorJoey Hess2016-03-07 18:20:31 -0400
committerJoey Hess2016-03-07 18:20:31 -0400
commit9556734c02a0b05764e83419ae72710908419cdc (patch)
treed60d67bb93a978f0cdce026d89ad46ae61d68487 /config.hs
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 'config.hs')
l---------config.hs2
1 files changed, 1 insertions, 1 deletions
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