fix(git): allow disabling --no-merges via config#1182
Closed
1llum1n4t1s wants to merge 1 commit into
Closed
Conversation
|
|
pszymkowiak
added
effort-small
Collaborator
📊 Automated PR Analysis
SummaryAdds a configurable Review Checklist
Linked issues: #1113 Analyzed automatically by wshm · This is an automated analysis, not a human review. |
1llum1n4t1s
force-pushed
the
fix/issue-1113-git-log-merge-commits
branch
from
8770e38 to
940109c
Compare
1llum1n4t1s
force-pushed
the
fix/issue-1113-git-log-merge-commits
branch
from
940109c to
21973f3
Compare
rtk git log always injected --no-merges, hiding merge commits with no way to opt out. Add [git] no_merges config option (default: true for backward compat). Users can set no_merges = false in config.toml to include merge commits in git log output. Also skip injection when user explicitly passes --no-merges to avoid duplicate flags. Closes #1113 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1llum1n4t1s
force-pushed
the
fix/issue-1113-git-log-merge-commits
branch
from
21973f3 to
d57c247
Compare
Author
|
Closing this PR as it doesn't look like it'll be merged. Feel free to reopen if there's interest. Thanks! 🙏 |
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
3 participants
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
[git] no_mergesconfig option to~/.config/rtk/config.toml(default:truefor backward compatibility)false,rtk git logno longer injects--no-merges, so merge commits appear in the output--no-mergesinjection when user explicitly passes--no-mergesto avoid duplicate flagsUsage
Test plan
test_git_config_default_no_merges_true— default is backward-compatibletest_git_config_no_merges_false— TOML deserialization workstest_git_config_absent_defaults_to_true— missing[git]section defaults correctlycargo fmt && cargo clippy --all-targets && cargo test --all— 1356 tests pass, 0 failuresCloses #1113
🤖 Generated with Claude Code