This is an automated cherry-pick of pingcap#19537

Signed-off-by: ti-chi-bot <[email protected]>
ti-chi-bot · Nov 29, 2024 · 2febf29 · 2febf29
1 parent b407322
commit 2febf29
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/br/br-pitr-manual.md b/br/br-pitr-manual.md
@@ -289,8 +289,13 @@ This command only accesses the backup storage and does not access the TiDB clust
 Usage example:
 
 ```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}'
+>>>>>>> 34fab29463 (br-pitr-manual: remove an unnecessary quotation mark (#19535) (#19537))
 ```
 
 Expected output:
@@ -330,7 +335,11 @@ The `--storage` parameter is used to specify the backup storage address. Current
 Usage example:
 
 ```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}'
+>>>>>>> 34fab29463 (br-pitr-manual: remove an unnecessary quotation mark (#19535) (#19537))
 ```
 
 Expected output:
@@ -379,9 +388,15 @@ The example output only shows the common parameters. These parameters are descri
 Usage example:
 
 ```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}'
+>>>>>>> 34fab29463 (br-pitr-manual: remove an unnecessary quotation mark (#19535) (#19537))
 
 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]