From 9ce91d7bb220ccf98d4e6df0156b5ccf72870c09 Mon Sep 17 00:00:00 2001
From: Aolin <aolin.zhang@pingcap.com>
Date: Wed, 15 Mar 2023 11:22:39 +0800
Subject: [PATCH 1/3] This is an automated cherry-pick of #13311

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
---
 pd-control.md | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/pd-control.md b/pd-control.md
index 2af83fa85342..7e4d9c90b706 100644
--- a/pd-control.md
+++ b/pd-control.md
@@ -1207,7 +1207,28 @@ Encoding 格式示例：
     >> scheduler config balance-hot-region-scheduler set enable-for-tiflash true
     ```
 
+<<<<<<< HEAD
 ### `store [delete | label | weight | remove-tombstone | limit ] <store_id> [--jq="<query string>"]`
+=======
+### `service-gc-safepoint`
+
+用于查询当前的 GC safepoint 与 service GC safepoint，输出结果示例如下：
+
+```bash
+{
+  "service_gc_safe_points": [
+    {
+      "service_id": "gc_worker",
+      "expired_at": 9223372036854775807,
+      "safe_point": 439923410637160448
+    }
+  ],
+  "gc_safe_point": 0
+}
+```
+
+### `store [delete | cancel-delete | label | weight | remove-tombstone | limit ] <store_id> [--jq="<query string>"]`
+>>>>>>> 36525faff (pd control: add service-gc-safepoint command (#13311))
 
 用于显示 store 信息或者删除指定 store。使用 jq 格式化输出请参考 [jq 格式化 json 输出示例](#jq-格式化-json-输出示例)。示例如下。
 

From d4ad3387cdaa472e4f01eeef9a2aece21cc94e08 Mon Sep 17 00:00:00 2001
From: Aolin <aolin.zhang@pingcap.com>
Date: Wed, 15 Mar 2023 11:26:20 +0800
Subject: [PATCH 2/3] Update pd-control.md

---
 pd-control.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pd-control.md b/pd-control.md
index 7e4d9c90b706..e669c8faf0de 100644
--- a/pd-control.md
+++ b/pd-control.md
@@ -1207,9 +1207,6 @@ Encoding 格式示例：
     >> scheduler config balance-hot-region-scheduler set enable-for-tiflash true
     ```
 
-<<<<<<< HEAD
-### `store [delete | label | weight | remove-tombstone | limit ] <store_id> [--jq="<query string>"]`
-=======
 ### `service-gc-safepoint`
 
 用于查询当前的 GC safepoint 与 service GC safepoint，输出结果示例如下：
@@ -1228,7 +1225,6 @@ Encoding 格式示例：
 ```
 
 ### `store [delete | cancel-delete | label | weight | remove-tombstone | limit ] <store_id> [--jq="<query string>"]`
->>>>>>> 36525faff (pd control: add service-gc-safepoint command (#13311))
 
 用于显示 store 信息或者删除指定 store。使用 jq 格式化输出请参考 [jq 格式化 json 输出示例](#jq-格式化-json-输出示例)。示例如下。
 

From ea9b9af299c1faa86dadaafcf600f9e034a6aa7c Mon Sep 17 00:00:00 2001
From: Aolin <aolin.zhang@pingcap.com>
Date: Wed, 15 Mar 2023 11:27:19 +0800
Subject: [PATCH 3/3] Update pd-control.md

---
 pd-control.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pd-control.md b/pd-control.md
index e669c8faf0de..2b0102a9b378 100644
--- a/pd-control.md
+++ b/pd-control.md
@@ -1224,7 +1224,7 @@ Encoding 格式示例：
 }
 ```
 
-### `store [delete | cancel-delete | label | weight | remove-tombstone | limit ] <store_id> [--jq="<query string>"]`
+### `store [delete | label | weight | remove-tombstone | limit ] <store_id> [--jq="<query string>"]`
 
 用于显示 store 信息或者删除指定 store。使用 jq 格式化输出请参考 [jq 格式化 json 输出示例](#jq-格式化-json-输出示例)。示例如下。