summaryrefslogtreecommitdiff
path: root/etc/.cfgl/config
diff options
context:
space:
mode:
authorXiao Pan <xyz@flylightning.xyz>2024-12-25 02:07:16 -0800
committerXiao Pan <xyz@flylightning.xyz>2024-12-25 02:07:16 -0800
commit94277ca5ac170f4650606bf2b4e8a5c4aa812c67 (patch)
tree98b685e01dc421733413933e8508ddee5d0289c1 /etc/.cfgl/config
parent7b9374bbe2b048931343e9bbdb39bd071d577052 (diff)
parent46c65d1bdb88d39e72d6e7280176687b6ad9488d (diff)
Merge branch 'ca' into ib
Combine ca into ia to become new ib VPS.
Diffstat (limited to 'etc/.cfgl/config')
-rw-r--r--etc/.cfgl/config4
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/.cfgl/config b/etc/.cfgl/config
index f54a1e6d..cf863b03 100644
--- a/etc/.cfgl/config
+++ b/etc/.cfgl/config
@@ -11,6 +11,6 @@
fetch = +refs/heads/*:refs/remotes/origin/*
[commit]
gpgsign = false
-[branch "ia"]
+[branch "ib"]
remote = origin
- merge = refs/heads/ia
+ merge = refs/heads/ib