Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Skip empty commits for umpf-tags #42

Merged
merged 1 commit into from
Jul 2, 2024

Conversation

bith3ad
Copy link

@bith3ad bith3ad commented Jul 2, 2024

There are cases where topic branches do have empty commits e.g. if the topic branches are managed via b4 [1]. b4 uses empty commits to track metadata. This is useful for topic branch management but shouldn't be part of the final umpf-tag. Therefore add --no-keep-empty to skip empty commits during the rebase.

[1] https://github.com/mricon/b4

There are cases where topic branches do have empty commits e.g. if the
topic branches are managed via b4 [1]. b4 uses empty commits to track
metadata. This is useful for topic branch management but shouldn't be
part of the final umpf-tag. Therefore add --no-keep-empty to skip empty
commits during the rebase.

[1] https://github.com/mricon/b4

Signed-off-by: Marco Felsch <[email protected]>
Copy link
Member

@michaelolbrich michaelolbrich left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, thanks.

@michaelolbrich michaelolbrich merged commit c2580a2 into pengutronix:master Jul 2, 2024
2 checks passed
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.

2 participants