From 55ac946fff6db13a5b0e1f7c3a64601ea26d94ef Mon Sep 17 00:00:00 2001
From: rhodes-b <59537185+rhodes-b@users.noreply.github.com>
Date: Wed, 17 Sep 2025 02:41:20 -0500
Subject: [PATCH 1/2] more info on do NOT copy default config

---
 src/config/config-template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/config/config-template b/src/config/config-template
index aac0b0b12..c9b51deb8 100644
--- a/src/config/config-template
+++ b/src/config/config-template
@@ -12,6 +12,9 @@
 # Run `ghostty +show-config --default --docs` to view a list of
 # all available config options and their default values.
 #
+# Do not copy the output of the defaults into your config, like stated above
+# users only need to set options to change the defaults.
+#
 # Additionally, each config option is also explained in detail
 # on Ghostty's website, at https://ghostty.org/docs/config.
 #

From f0e407de85fac529a76a1f353eacf4f209ae7c4c Mon Sep 17 00:00:00 2001
From: rhodes-b <59537185+rhodes-b@users.noreply.github.com>
Date: Sat, 20 Sep 2025 02:28:07 -0500
Subject: [PATCH 2/2] nicer comment on why you shouldn't copy the defaults into
 your config specifically that some options will conflict with each other

---
 src/config/config-template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/config/config-template b/src/config/config-template
index c9b51deb8..63309137a 100644
--- a/src/config/config-template
+++ b/src/config/config-template
@@ -6,15 +6,15 @@
 #   {[path]s}
 #
 # The template does not set any default options, since Ghostty ships
-# with sensible defaults for all options. Users should only need to set
-# options that they want to change from the default.
+# with sensible defaults for all options.
+# Note that you should not paste the output of `ghostty +show-config
+# --default` into your config: some default options actually conflict with each other
+# when explicitly set in a configuration file. Instead, only set the
+# options you actually need.
 #
 # Run `ghostty +show-config --default --docs` to view a list of
 # all available config options and their default values.
 #
-# Do not copy the output of the defaults into your config, like stated above
-# users only need to set options to change the defaults.
-#
 # Additionally, each config option is also explained in detail
 # on Ghostty's website, at https://ghostty.org/docs/config.
 #