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 | 2901c0a67bfadea50b60dcd3f371d0d97a0780e5 (patch) | |
| tree | c41b8bbc016fb9d1c6ea16e8bd678a5638360480 /modules | |
| parent | 0be39bc9fa41f14f9d6d1a449f8f2b77a502c619 (diff) | |
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.
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude <noreply@anthropic.com>
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/reconcile-open-repos.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/reconcile-open-repos.el b/modules/reconcile-open-repos.el index 2e48e45d..4bd0be7c 100644 --- a/modules/reconcile-open-repos.el +++ b/modules/reconcile-open-repos.el @@ -51,7 +51,7 @@ Magit for review." ;; if git directory is clean, pulling generates no errors (if (string-empty-p (shell-command-to-string "git status --porcelain")) (progn - (let ((pull-result (shell-command "git pull --quiet"))) + (let ((pull-result (shell-command "git pull --rebase --quiet"))) (unless (= pull-result 0) (message "Warning: git pull failed for %s (exit code: %d)" directory pull-result)))) @@ -61,7 +61,7 @@ Magit for review." (let ((stash-result (shell-command "git stash --quiet"))) (if (= stash-result 0) (progn - (let ((pull-result (shell-command "git pull --quiet"))) + (let ((pull-result (shell-command "git pull --rebase --quiet"))) (if (= pull-result 0) (let ((stash-pop-result (shell-command "git stash pop --quiet"))) (unless (= stash-pop-result 0) |