aboutsummaryrefslogtreecommitdiff
path: root/data
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
commit9af54e7048cd694d5dd3b9044a834d881787f229 (patch)
tree5b47c63122b907ba7aa5038059aefbfb71809a2f /data
parent3cbd4d696b2bb9903494265edba108f7e38f7566 (diff)
downloaddotemacs-9af54e7048cd694d5dd3b9044a834d881787f229.tar.gz
dotemacs-9af54e7048cd694d5dd3b9044a834d881787f229.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 'data')
0 files changed, 0 insertions, 0 deletions