Skip to content

Rearchitect squash edit message to include all commits. #116

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Jun 24, 2021
Merged

Rearchitect squash edit message to include all commits. #116

merged 1 commit into from
Jun 24, 2021

Conversation

topher200
Copy link
Contributor

Resolves #71.

This change makes stgit's squash commit edit message mirror git's.

asciicast

New edit message example:

# This is a combination of 3 patches.
# This is the commit message for foo (patch #1):
foo

# This is the commit message for bar (patch #2):
bar

# This is the commit message for baz (patch #3):
baz

# Please enter the commit message for your patch. Lines starting
# with '#' will be ignored.

@topher200
Rearchitect squash edit message to include all commits.
ab29550 
Resolves stacked-git#71.

This change makes stgit's squash behavior mirror git's behavior, which should
be nice for people coming from vanilla 'git'.

Breaking change(?): Users now need to manually remove undesired messages from
squashed patches.
@jpgrayson jpgrayson merged commit 150ec62 into stacked-git:master Jun 24, 2021
@jpgrayson
Copy link
Collaborator

Wow, thanks for this PR. Let's make this the new approach for squash!

@topher200 topher200 deleted the new-squash-edit-message branch June 24, 2021 15:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Feature request: Add option to stg squash to preserve text below the --- line
2 participants
@topher200 @jpgrayson