Skip to content

Commit 4e497ee

Browse files
committed
reword documentation for git.autoForwardBranches
1 parent e6bd9d0 commit 4e497ee

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

docs/Config.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ git:
337337
# If true, periodically refresh files and submodules
338338
autoRefresh: true
339339

340-
# 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).
340+
# 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).
341341
# Possible values: 'none' | 'onlyMainBranches' | 'allBranches'
342342
autoForwardBranches: onlyMainBranches
343343

pkg/config/user_config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ type GitConfig struct {
244244
AutoFetch bool `yaml:"autoFetch"`
245245
// If true, periodically refresh files and submodules
246246
AutoRefresh bool `yaml:"autoRefresh"`
247-
// 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).
247+
// 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).
248248
// Possible values: 'none' | 'onlyMainBranches' | 'allBranches'
249249
AutoForwardBranches string `yaml:"autoForwardBranches" jsonschema:"enum=none,enum=onlyMainBranches,enum=allBranches"`
250250
// If true, pass the --all arg to git fetch

schema/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@
331331
"onlyMainBranches",
332332
"allBranches"
333333
],
334-
"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'",
334+
"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'",
335335
"default": "onlyMainBranches"
336336
},
337337
"fetchAll": {

0 commit comments

Comments
 (0)