git add --resolved stages conflict-resolved paths
When conflict-resolved paths remain unmerged, run `git add --resolved` to stage them. It refuses to stage any files if an unmerged path still has conflict markers.
git add --resolvedWe scan this tool’s changelog a few times a day and keep the changes that would alter your agent’s next action: 3 since April 2026, each linked to its source.
gitWhen conflict-resolved paths remain unmerged, run `git add --resolved` to stage them. It refuses to stage any files if an unmerged path still has conflict markers.
git add --resolvedWhen debugging repository URL handling, use `git url-parse` to parse URLs and extract components. Without `--component`, it validates the URLs and produces no output.
git url-parse --component <component> <url> [<url>…]When you need to split a commit, run `git history split <commit>` and interactively choose hunks for a new parent commit; Git prompts for both commit messages. For rewriting a commit message, run `git history reword <commit>`.
git history split <commit>