| Age | Commit message (Collapse) | Author |
|
Changed from merge strategy to rebase strategy when pulling updates
in the multi-repo reconciliation workflow. This avoids creating
unnecessary merge commits and maintains linear history.
Changes:
- Line 54: git pull --quiet → git pull --rebase --quiet (clean repos)
- Line 64: git pull --quiet → git pull --rebase --quiet (dirty repos)
Benefits:
- Cleaner git history (no merge commits for simple pulls)
- Consistent with best practices for personal development
- Aligns with git pull --rebase --autostash used elsewhere
The workflow still maintains its error handling and Magit integration
for conflict resolution.
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude <noreply@anthropic.com>
|
|
Remove unnecessary autoload directives from various functions across
multiple modules, cleaning up the codebase and improving
readability. These directives were redundant and not needed for the
current project setup.
|
|
Improve the workflow for synchronizing git repositories across
projects. Add detailed commentary and handle edge cases for stash,
pull, and stash pop operations. Implement checks for project
directories and dependencies defined in init.el, enhancing
robustness against undefined variables and failed git operations.
Ensure Magit opens for manual intervention when issues arise.
|
|
|
|
|