Merge remote-tracking branch 'origin/main' into docs-option-tables

# Conflicts:
#	docs/fish-config.md
#	docs/manual/05-functions/14-miscellaneous.md
This commit is contained in:
2026-07-26 04:37:55 -04:00
4 changed files with 6 additions and 17 deletions
+1 -3
View File
@@ -36,8 +36,6 @@ configured git remote:
config-update --dry-run Preview available changes without applying them
config-update --force Stash local changes, pull, then restore the stash
The remote URL (https://git.rootiest.dev/rootiest/fish-config.git) is
hard-coded, so this works on a fresh clone with no origin configured. All
git output is suppressed. Run exec fish after a successful update to reload.
All git output is suppressed. Run exec fish after a successful update to reload.
---