feat(sync): add --autostash flag for rebase phase#292
Merged
Conversation
Add --autostash option to `daft sync --rebase` that passes `--autostash` to the underlying `git rebase` command, automatically stashing and restoring uncommitted changes during rebase. Using --autostash without --rebase produces a clap validation error. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
--autostashflag todaft sync --rebasethat passes--autostashto the underlyinggit rebasecommand, automatically stashing and restoring uncommitted changes during rebase--autostashwithout--rebaseproduces a clap validation error viarequires = "rebase"Test plan
mise run clippypasses with zero warningsmise run fmt:checkpassesmise run test:unit— 618 tests passmise run man:verify— man pages up to datetest_sync_rebase_autostash— dirty worktree is rebased with autostash, uncommitted changes preservedtest_sync_autostash_without_rebase— error when--autostashused without--rebase🤖 Generated with Claude Code