Implement reset command, branch safety checks, and merge flow#6
Merged
Conversation
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
…d modes - Add subcommand: unstage files or move HEAD with --soft/--mixed/--hard - Support to restore index entries from HEAD tree - Support to move branch ref - Support parent traversal in commit resolution (e.g. HEAD~3) - Handle edge case: unstage before any commits (remove from index directly) - Expose and in core::checkout Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
…0-2) - Check for modified/deleted tracked files before switching branches - Refuse checkout with dirty working tree unless --force/-f is used - Clear error message directing user to commit or stash changes Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
- Add subcommand for managing user.name, user.email, aliases - Support (get), (set) - Support to show all config, to remove a key - Support flag for ~/.agitconfig.toml vs repo .agit/config.toml - Fallback to default values for user.name/email when key not found Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
- commit now detects MERGE_HEAD and creates merge commit with both parents - commit auto-uses MERGE_MSG when no -m flag provided during merge - merge --abort: restore index+working tree to ORIG_HEAD, clean merge state - merge --continue: delegates to commit (which handles MERGE_HEAD) - ORIG_HEAD saved at merge start for reliable abort recovery Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
- Cargo.toml: 0.4.1 -> 0.5.4 - docs/MISSING_FEATURES.md: mark all P0 items as done with commit hashes Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
add detailed issue report about the improper file read error handling in checkout command, including problem description, reproduction steps and fix suggestion
1. 更新 Cargo.lock 版本号至 0.5.4 2. 格式化代码参数声明的换行排版 3. 重构部分函数参数格式提升可读性 4. 新增中文 README 文档 5. 优化英文 README 的表述和结构
更新Cargo.toml和Cargo.lock中的版本号从0.5.4到0.5.5
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.
No description provided.