diff options
| author | Craig Jennings <c@cjennings.net> | 2025-11-15 14:11:50 -0600 |
|---|---|---|
| committer | Craig Jennings <c@cjennings.net> | 2025-11-15 14:11:50 -0600 |
| commit | 2fd7b637cd1f0428ea73925875473f2fac9f0990 (patch) | |
| tree | 32b318aed72b3b51a6838c05e062b2d1e8980921 /modules/calendar-sync.el | |
| parent | 740b35c483c966729f7b77a7bf6293b913da1202 (diff) | |
| download | dotemacs-2fd7b637cd1f0428ea73925875473f2fac9f0990.tar.gz dotemacs-2fd7b637cd1f0428ea73925875473f2fac9f0990.zip | |
refactor(reconcile-open-repos): Use git pull --rebase for cleaner history
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.
Diffstat (limited to 'modules/calendar-sync.el')
0 files changed, 0 insertions, 0 deletions
