From 804e7288ac7e07e0ea550013b4efa0b53af3ff9b Mon Sep 17 00:00:00 2001
From: thuhole <thuhole@protonmail.com>
Date: Wed, 8 Jul 2020 10:21:00 +0800
Subject: [PATCH 1/6] dev branch

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index fcd2059c..101ccf41 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "build": "react-scripts build",
     "test": "echo 'skipped react-scripts test --env=jsdom'",
     "predeploy": "",
-    "deploy": "gh-pages -d build -m $(TZ=Asia/Shanghai date +\"%y%m%d%H%M%S\")",
+    "deploy": "gh-pages -b gh-pages-dev -d build -m $(TZ=Asia/Shanghai date +\"%y%m%d%H%M%S\")",
     "eject": "react-scripts eject"
   },
   "homepage": "https://://cdn.jsdelivr.net/gh/thuhole/webhole@gh-pages",

From 01d91272e726748cca5143872dbf43bd1457fb58 Mon Sep 17 00:00:00 2001
From: thuhole <thuhole@protonmail.com>
Date: Wed, 8 Jul 2020 10:21:38 +0800
Subject: [PATCH 2/6] bug fix

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 101ccf41..7b6536ed 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "deploy": "gh-pages -b gh-pages-dev -d build -m $(TZ=Asia/Shanghai date +\"%y%m%d%H%M%S\")",
     "eject": "react-scripts eject"
   },
-  "homepage": "https://://cdn.jsdelivr.net/gh/thuhole/webhole@gh-pages",
+  "homepage": "https://://cdn.jsdelivr.net/gh/thuhole/webhole@gh-pages-dev",
   "browserslist": {
     "production": [
       ">0.2%",

From 9499020640b5aded9f001f93367f4b5c498ee8b5 Mon Sep 17 00:00:00 2001
From: thuhole <thuhole@protonmail.com>
Date: Wed, 8 Jul 2020 10:27:18 +0800
Subject: [PATCH 3/6] dev branch

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 7b6536ed..885936ee 100644
--- a/package.json
+++ b/package.json
@@ -23,10 +23,10 @@
     "build": "react-scripts build",
     "test": "echo 'skipped react-scripts test --env=jsdom'",
     "predeploy": "",
-    "deploy": "gh-pages -b gh-pages-dev -d build -m $(TZ=Asia/Shanghai date +\"%y%m%d%H%M%S\")",
+    "deploy": "gh-pages -r https://github.com/thuhole/webhole-dev -d build -m $(TZ=Asia/Shanghai date +\"%y%m%d%H%M%S\")",
     "eject": "react-scripts eject"
   },
-  "homepage": "https://://cdn.jsdelivr.net/gh/thuhole/webhole@gh-pages-dev",
+  "homepage": "https://://cdn.jsdelivr.net/gh/thuhole/webhole-dev@gh-pages",
   "browserslist": {
     "production": [
       ">0.2%",

From 8bc0eee3b39d4d572c11dc3ea00afb982c7c8457 Mon Sep 17 00:00:00 2001
From: thuhole <thuhole@protonmail.com>
Date: Wed, 8 Jul 2020 10:51:59 +0800
Subject: [PATCH 4/6] update

---
 README.md    | 6 ++++++
 package.json | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ef0dcbf4..0c577ca5 100644
--- a/README.md
+++ b/README.md
@@ -32,6 +32,12 @@
 
 对 T大树洞 后端服务、客户端、账号、树洞内容的反馈请联系邮件 thuhole at protonmail dot com。
 
+## branch说明：
+- master branch: 主分支
+- dev branch: 开发分支
+- gh-pages branch: dev分支的部署分支，用于测试
+- gh-pages-master branch: master分支的部署分支，用于jsdelivr CDN
+
 ## License
 
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
diff --git a/package.json b/package.json
index 885936ee..1e1ce328 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "build": "react-scripts build",
     "test": "echo 'skipped react-scripts test --env=jsdom'",
     "predeploy": "",
-    "deploy": "gh-pages -r https://github.com/thuhole/webhole-dev -d build -m $(TZ=Asia/Shanghai date +\"%y%m%d%H%M%S\")",
+    "deploy": "gh-pages -d build -m $(TZ=Asia/Shanghai date +\"%y%m%d%H%M%S\")",
     "eject": "react-scripts eject"
   },
   "homepage": "https://://cdn.jsdelivr.net/gh/thuhole/webhole-dev@gh-pages",

From a000a53f044b0e51060d8db063f00368026cbb65 Mon Sep 17 00:00:00 2001
From: thuhole <thuhole@protonmail.com>
Date: Wed, 8 Jul 2020 10:57:52 +0800
Subject: [PATCH 5/6] bug fix

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1e1ce328..fcd2059c 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "deploy": "gh-pages -d build -m $(TZ=Asia/Shanghai date +\"%y%m%d%H%M%S\")",
     "eject": "react-scripts eject"
   },
-  "homepage": "https://://cdn.jsdelivr.net/gh/thuhole/webhole-dev@gh-pages",
+  "homepage": "https://://cdn.jsdelivr.net/gh/thuhole/webhole@gh-pages",
   "browserslist": {
     "production": [
       ">0.2%",

From 35f48fb4f11ba8deda34af3f88e5e74730f0cbc2 Mon Sep 17 00:00:00 2001
From: thuhole <thuhole@protonmail.com>
Date: Wed, 8 Jul 2020 11:26:18 +0800
Subject: [PATCH 6/6] update

---
 public/CNAME | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/CNAME b/public/CNAME
index d8132a15..c6e82877 100644
--- a/public/CNAME
+++ b/public/CNAME
@@ -1 +1 @@
-tst.thuhole.com
\ No newline at end of file
+dev.thuhole.com
\ No newline at end of file