Skip to content

feat: say "which absorbed" instead of "dropping" under --absorbed#5

Merged
Phlogistique merged 2 commits into
mainfrom
absorbed-wording
Jul 6, 2026
Merged

feat: say "which absorbed" instead of "dropping" under --absorbed#5
Phlogistique merged 2 commits into
mainfrom
absorbed-wording

Conversation

@Phlogistique

Copy link
Copy Markdown
Contributor

With --absorbed the old parent is recorded as an extra parent, so it is merged rather than dropped. The output previously still said "dropping <old>", which contradicts what happened.

Now under --absorbed both the default commit message and the success line read "which absorbed <old>". The plain (non-absorbed) path is unchanged.

🤖 Generated with Claude Code

Phlogistique and others added 2 commits July 6, 2026 17:37
With --absorbed the old parent is recorded as an extra parent, so it is
merged rather than dropped. Reflect that in the default commit message and
the success line.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
"Merge develop into HEAD, which absorbed feature" reads as HEAD absorbing
feature. Reorder to "Merge develop, which absorbed feature, into HEAD" so the
clause modifies <new>.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Phlogistique
Phlogistique marked this pull request as ready for review July 6, 2026 15:45
@Phlogistique
Phlogistique merged commit f09cdf8 into main Jul 6, 2026
2 checks passed
@github-actions github-actions Bot mentioned this pull request Jul 6, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant