From 4e497eef8aade499ae1991082bbd3e5b61d1f857 Mon Sep 17 00:00:00 2001
From: sean simonsen <sean@sean.xyz>
Date: Thu, 8 May 2025 16:37:26 -0400
Subject: [PATCH] reword documentation for git.autoForwardBranches

---
 docs/Config.md            | 2 +-
 pkg/config/user_config.go | 2 +-
 schema/config.json        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/Config.md b/docs/Config.md
index 906b292a8..d401e833c 100644
--- a/docs/Config.md
+++ b/docs/Config.md
@@ -337,7 +337,7 @@ git:
   # If true, periodically refresh files and submodules
   autoRefresh: true
 
-  # If not "none", lazygit will automatically forward branches to their upstream after fetching. Applies to branches that are not the currently checked out branch, and only to those that are strictly behind their upstream (as opposed to diverged).
+  # If not "none", lazygit will automatically fast-forward local branches to match their upstream after fetching. Applies to branches that are not the currently checked out branch, and only to those that are strictly behind their upstream (as opposed to diverged).
   # Possible values: 'none' | 'onlyMainBranches' | 'allBranches'
   autoForwardBranches: onlyMainBranches
 
diff --git a/pkg/config/user_config.go b/pkg/config/user_config.go
index 9c6160f68..2becab4c9 100644
--- a/pkg/config/user_config.go
+++ b/pkg/config/user_config.go
@@ -244,7 +244,7 @@ type GitConfig struct {
 	AutoFetch bool `yaml:"autoFetch"`
 	// If true, periodically refresh files and submodules
 	AutoRefresh bool `yaml:"autoRefresh"`
-	// If not "none", lazygit will automatically forward branches to their upstream after fetching. Applies to branches that are not the currently checked out branch, and only to those that are strictly behind their upstream (as opposed to diverged).
+	// If not "none", lazygit will automatically fast-forward local branches to match their upstream after fetching. Applies to branches that are not the currently checked out branch, and only to those that are strictly behind their upstream (as opposed to diverged).
 	// Possible values: 'none' | 'onlyMainBranches' | 'allBranches'
 	AutoForwardBranches string `yaml:"autoForwardBranches" jsonschema:"enum=none,enum=onlyMainBranches,enum=allBranches"`
 	// If true, pass the --all arg to git fetch
diff --git a/schema/config.json b/schema/config.json
index 4efe65f45..295dc2ceb 100644
--- a/schema/config.json
+++ b/schema/config.json
@@ -331,7 +331,7 @@
             "onlyMainBranches",
             "allBranches"
           ],
-          "description": "If not \"none\", lazygit will automatically forward branches to their upstream after fetching. Applies to branches that are not the currently checked out branch, and only to those that are strictly behind their upstream (as opposed to diverged).\nPossible values: 'none' | 'onlyMainBranches' | 'allBranches'",
+          "description": "If not \"none\", lazygit will automatically fast-forward local branches to match their upstream after fetching. Applies to branches that are not the currently checked out branch, and only to those that are strictly behind their upstream (as opposed to diverged).\nPossible values: 'none' | 'onlyMainBranches' | 'allBranches'",
           "default": "onlyMainBranches"
         },
         "fetchAll": {