From 7e35b592c0cbd8c5f01482680811d7236e4eebd7 Mon Sep 17 00:00:00 2001
From: Ariver <shanghai3168@gmail.com>
Date: Tue, 25 Aug 2026 16:31:26 +0800
Subject: [PATCH] 日记与笔记文件: YY.MMDD 前缀批量改为 YYYY-MM-DD
---
X0.Diary/2026-03-22.md | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/X0.Diary/26.0322.md b/X0.Diary/2026-03-22.md
similarity index 89%
rename from X0.Diary/26.0322.md
rename to X0.Diary/2026-03-22.md
index 10919d6..60262a6 100755
--- a/X0.Diary/26.0322.md
+++ b/X0.Diary/2026-03-22.md
@@ -1,6 +1,7 @@
---
words:
2026-04-05: 159
+ 2026-08-25: 168
---
# GTD
@@ -15,7 +16,7 @@
# Misc
-- ~~~~
+
# ddup
@@ -27,6 +28,8 @@
- CD进入文件
- 适用下面的命令进行合并
+
+#### #命令行 合并声音文件和视频文件
```bash
ffmpeg -y -i 2.mp4 -i 2.m4a -c:v copy -c:a copy -shortest 合并.mp4
```
\ No newline at end of file
--
Gitblit v1.9.3