Repository navigation
Conversation
Dronakurl
force-pushed
the
gitbase-picker
branch
8 times, most recently
from
July 3, 2026 19:42
3a0e65b to
223cb6c
Compare
Dronakurl
force-pushed
the
gitbase-picker
branch
from
September 5, 2026 10:44
c56292a to
aba0897
Compare
Includes: - Configurable git diff base - DiffBase status line element - Proper diff base passing to file picker - set-diff-base and reset-diff-base commands - Fixes for gitbase-picker functionality Generated by Mistral Vibe. Co-Authored-By: Mistral Vibe <vibe@mistral.ai> remove unnecessary check formatting
- Use native gix tree diff in status_with_base instead of git CLI - Enables rename/copy detection with configurable rewrites - Combines committed changes (base->HEAD) with unstaged changes - More robust error handling and path handling - Add helper functions: - get_file_at_commit: Get file content at any commit - tree_change_to_file_change: Convert tree diff to FileChange - picker_tracks_entry_kind: Filter tracked entry types - Add shared diff_base_target_path helper in typed.rs - Update documentation in lib.rs - Update test.rs with better test infrastructure Generated by Mistral Vibe. Co-Authored-By: Mistral Vibe <vibe@mistral.ai>
Dronakurl
force-pushed
the
gitbase-picker
branch
from
October 10, 2026 17:55
aba0897 to
ef724a4
Compare
This branch has not been deployed
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
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.
This PR introduces the gitbase-picker feature, allowing users to set a custom diff base (e.g., :set-diff-base master) for git operations in the current worktree. The implementation includes a trust-aware diff base system that properly handles workspace trust settings, ensuring secure file access while maintaining full functionality. The feature integrates with the existing git picker (space-g) to display changes relative to the selected base.
This PR was prepared with the use of an AI companion