aboutsummaryrefslogtreecommitdiff
path: root/modules/archived
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
commitc2351efe7e1d813e58482b12c87659c9aa41f174 (patch)
treec41b8bbc016fb9d1c6ea16e8bd678a5638360480 /modules/archived
parent8e8152e13b455021e604ea8cb989028bda1c9f5a (diff)
downloaddotemacs-c2351efe7e1d813e58482b12c87659c9aa41f174.tar.gz
dotemacs-c2351efe7e1d813e58482b12c87659c9aa41f174.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/archived')
0 files changed, 0 insertions, 0 deletions