Commit Graph

2 Commits

Author SHA1 Message Date
Yury Kossakovsky
e8f7934224 feat(git): add make git-pull command for fork workflows
adds support for forks that maintain custom changes and need to merge
from upstream instead of resetting. the new GIT_MODE=merge option in
update.sh calls git_merge_from_upstream() which fetches and merges
upstream/main while preserving local commits.
2026-01-09 20:28:22 -07:00
Yury Kossakovsky
9b252a1287 refactor(update): replace git pull with fetch + reset for reliable sync
extract git utilities into scripts/git.sh module. this approach handles
accidental local commits that would cause rebase conflicts during updates.
2025-12-26 09:29:53 -07:00