Merged
Conversation
…e parent from base before calling blame.
acunniffe
commented
Oct 4, 2025
| /// - `git merge abc --squash` => pos_command(0) returns Some("abc") | ||
| /// - `git merge --squash --no-verify abc` => pos_command(0) returns Some("abc") | ||
| /// - `git merge abc def --squash` => pos_command(1) returns Some("def") | ||
| pub fn pos_command(&self, n: u8) -> Option<String> { |
Collaborator
Author
There was a problem hiding this comment.
@svarlamov trying to support parsing positional arguments
git merge feat/abc --squash
git merge --squash --other-flag feat/abc --flag-after-that
post_command(0) // always "feat/abc"
Does it look right?
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.
Rewrites authorship and working logs to support history rewriting operations.
Introduces patterns,
rewirte_logand triggers off these commandscommit --amendmerge --squashreset --hardNext up in future PRs
Known issues
--squashflagsgit merge [<options>] <commit>...