sync

/sync

Atomic fetch-rebase-push with auto-stash. Resolves the common "push rejected because remote advanced" problem in one step, even when you have unstaged changes — automatically stashes dirty working tree before rebase and restores after push. Also handles post-merge branch cleanup via --cleanup. Use instead of manual git pull --rebase && git push sequences. Consolidates the former /cleanup_branch command (now /sync --cleanup).

Usage

/sync [branch] [--cleanup]

Examples:

• /sync (syncs current branch)
• /sync main (syncs the specified branch)
• /sync --cleanup (switch to main, pull, delete current branch locally + remotely)
• /sync --cleanup fix/pre-commit-scoped-lint (delete a specific merged branch)

Argument parsing

Parse $ARGUMENTS to extract:

• --cleanup: Post-merge branch cleanup mode (see Phase B below)
• Any remaining non-flag token is the branch name. If omitted, use current branch.

---

Default behavior (no flags): fetch-rebase-push

1) Stash if dirty

If the working tree has uncommitted changes, run git stash --include-untracked. Note stash was created so it can be restored at the end.

2) Fetch

Run git fetch origin.

3) Check divergence

Run git rev-list --left-right --count HEAD...origin/<branch> to see how far ahead/behind we are.

• If already up to date (0 behind, 0 ahead or only ahead): skip rebase, go to push.
• If behind: rebase onto origin/.
• If diverged (both ahead and behind): rebase onto origin/.

4) Rebase

Run git rebase origin/<branch>.

• If rebase succeeds: continue to push.
• If rebase has conflicts: abort the rebase (git rebase --abort), restore stash if created, and report the conflicting files. Do NOT attempt to resolve conflicts automatically.

5) Push

Run git push origin <branch>.

• If no upstream is set, use git push -u origin <branch>.

6) Restore stash

If step 1 stashed changes, run git stash pop.

7) Report

Synced:
  Branch:  <branch>
  Rebased: <N> commits from origin/<branch>
  Pushed:  <M> local commits
  Status:  clean | stash restored