This is an automated cherry-pick of #19176

Signed-off-by: ti-chi-bot <[email protected]>
pingcap · Nov 29, 2024 · ee454c0 · ee454c0
1 parent d530304
commit ee454c0
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/br/br-pitr-manual.md b/br/br-pitr-manual.md
@@ -288,8 +288,13 @@ Global Flags:
 使用示例：
 
 ```shell
+<<<<<<< HEAD
 ./br log truncate --until='2022-07-26 21:20:00+0800' \
 –-storage='s3://backup-101/logbackup?access-key=${access-key}&secret-access-key=${secret-access-key}"'
+=======
+tiup br log truncate --until='2022-07-26 21:20:00+0800' \
+--storage='s3://backup-101/logbackup?access-key=${access-key}&secret-access-key=${secret-access-key}'
+>>>>>>> 3e0690f822 (br-pitr-manual: remove an unnecessary quotation mark (#19175) (#19176))
 ```
 
 该子命令运行后输出以下信息：
@@ -329,7 +334,11 @@ Global Flags:
 使用示例：
 
 ```shell
+<<<<<<< HEAD
 ./br log metadata –-storage='s3://backup-101/logbackup?access-key=${access-key}&secret-access-key=${secret-access-key}"'
+=======
+tiup br log metadata --storage='s3://backup-101/logbackup?access-key=${access-key}&secret-access-key=${secret-access-key}'
+>>>>>>> 3e0690f822 (br-pitr-manual: remove an unnecessary quotation mark (#19175) (#19176))
 ```
 
 该子命令运行后输出以下信息：
@@ -378,9 +387,15 @@ Global Flags:
 使用示例：
 
 ```shell
+<<<<<<< HEAD
 ./br restore point --pd="${PD_IP}:2379"
 --storage='s3://backup-101/logbackup?access-key=${access-key}&secret-access-key=${secret-access-key}"'
 --full-backup-storage='s3://backup-101/snapshot-202205120000?access-key=${access-key}&secret-access-key=${secret-access-key}"'
+=======
+tiup br restore point --pd="${PD_IP}:2379"
+--storage='s3://backup-101/logbackup?access-key=${access-key}&secret-access-key=${secret-access-key}'
+--full-backup-storage='s3://backup-101/snapshot-202205120000?access-key=${access-key}&secret-access-key=${secret-access-key}'
+>>>>>>> 3e0690f822 (br-pitr-manual: remove an unnecessary quotation mark (#19175) (#19176))
 
 Full Restore <--------------------------------------------------------------------------------------------------------------------------------------------------------> 100.00%
 *** ***["Full Restore success summary"] ****** [total-take=3.112928252s] [restore-data-size(after-compressed)=5.056kB] [Size=5056] [BackupTS=434693927394607136] [total-kv=4] [total-kv-size=290B] [average-speed=93.16B/s]