aboutsummaryrefslogtreecommitdiff
path: root/modules/calendar-sync.el
diff options
context:
space:
mode:
authorCraig Jennings <c@cjennings.net>2025-11-15 14:11:50 -0600
committerCraig Jennings <c@cjennings.net>2025-11-15 14:11:50 -0600
commit3a8386ec049d1ca9a7dfcc4cee5312f46b25a432 (patch)
tree5b47c63122b907ba7aa5038059aefbfb71809a2f /modules/calendar-sync.el
parentfa7df5ee109e50e5d67b7d06c2558ea018042c9c (diff)
downloaddotemacs-3a8386ec049d1ca9a7dfcc4cee5312f46b25a432.tar.gz
dotemacs-3a8386ec049d1ca9a7dfcc4cee5312f46b25a432.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