We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent e7b7ae8 commit 85c8f00Copy full SHA for 85c8f00
docs/changelog.md
@@ -1,3 +1,29 @@
1
+#### 1.5.0-beta.12
2
+
3
+* Add `merge` command **1**
4
+* Fixes and improvements
5
6
+**1**:
7
8
+This command also parses path resources that appear in the configuration file and replaces them with embedded
9
+configuration, such as TLS certificates or SSH private keys.
10
11
+```
12
+Merge configuration
13
14
+Usage:
15
+ sing-box merge [output] [flags]
16
17
+Flags:
18
+ -h, --help help for merge
19
20
+Global Flags:
21
+ -c, --config stringArray set configuration file path
22
+ -C, --config-directory stringArray set configuration directory path
23
+ -D, --directory string set working directory
24
+ --disable-color disable color output
25
26
27
#### 1.5.0-beta.11
28
29
* Add DNS01 challenge support for ACME TLS certificate issuer **1**
0 commit comments